Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 549) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 550) @@ -5,4 +5,24 @@ ################################################################## [project attributes] +console.toolbox = [{'autosave': False, + 'id': 'cmd-V24LgbnhXmQ69KYX', + 'io_encoding': None, + 'key_binding': None, + 'line_mode': True, + 'loc': u'/home/jdalbey/Dropbox/TMCrepo/trunk/src/python/unifiedlogger/__main__.py', + 'pseudo_tty': False, + 'raise_panel': True, + 'shared': False, + 'title': None}, + {'autosave': False, + 'id': 'cmd-zde72uIOzRuMXDlM', + 'io_encoding': None, + 'key_binding': None, + 'line_mode': True, + 'loc': u'/home/jdalbey/Dropbox/TMCrepo/trunk/src/python/unifiedlogger/extract_caddetails.py', + 'pseudo_tty': False, + 'raise_panel': True, + 'shared': False, + 'title': None}] debug.launch-configs = (2, {'launch-79fWcT8eQm1A3xyz': ({}, @@ -49,6 +69,9 @@ loc('extend_unifiedlogger.py'): ('custom', (u'', + 'launch-Dap54cn2qAN7AXZm')), + loc('extract_caddetails.py'): ('custom', + (u'', 'launch-Dap54cn2qAN7AXZm'))} -proj.main-file = loc('extend_unifiedlogger.py') +proj.main-file = loc('extract_caddetails.py') [user attributes] debug.show-args-dialog = {loc('__main__.py'): False} @@ -58,5 +81,5 @@ 'windows': [{'name': '0BtsNVOAornvyNAPNOxHAmuDFR'\ 'v7Dw8l', - 'size-state': 'maximized', + 'size-state': '', 'type': 'dock', 'view': {'area': 'tall', @@ -102,8 +125,8 @@ 'primary_view_state': {'area': 'wide', 'constraint': None, - 'current_pages': [3, - 1], + 'current_pages': [1, + 2], 'notebook_display': 'normal', - 'notebook_percent': 0.16227461858529824, + 'notebook_percent': 0.4230235783633842, 'override_title': None, 'pagelist': [('batch-search', @@ -151,7 +174,7 @@ 'fOmitBinary': True, 'fRegexFlags': 42, - 'fReplaceText': u'lastLineNum', + 'fReplaceText': u'details_file', 'fReverse': False, - 'fSearchText': u'fileLength', + 'fSearchText': u'out_file', 'fStartPos': 0, 'fStyle': 'text', @@ -188,7 +211,7 @@ 'launch-id': None, 'sel-line': 3L, - 'sel-line-start': 132L, - 'selection_end': 132L, - 'selection_start': 132L, + 'sel-line-start': 131L, + 'selection_end': 131L, + 'selection_start': 131L, 'zoom': 0L}), ('messages', @@ -201,192 +224,16 @@ {'last-percent': 0.8, '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': 0L, + 'toolbox-tree-sel': 'cmd-zde72uIOzRuMXDlM'})], + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('extend_unifiedlogger.py'), + {'attrib-starts': [], + 'code-line': ' for info_type in script_event:\n', + 'first-line': 15L, 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, + 'sel-line': 27L, + 'sel-line-start': 879L, + 'selection_end': 879L, + 'selection_start': 879L, 'zoom': 0L}, - 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], - [loc('cad_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 18)], - 'code-line': ' return []\n', - 'first-line': 33L, - 'folded-linenos': [], - 'sel-line': 45L, - 'sel-line-start': 1479L, - 'selection_end': 1479L, - 'selection_start': 1479L, - 'zoom': 0L}, - 1575992486.57154], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with previous time: ", toHM'\ - 'S(seconds)\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, - 'zoom': 0L}, - 1575992490.79159], - [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}, - 1575992492.507506], - [loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with previous time: ", toHM'\ - 'S(seconds)\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, - 'zoom': 0L}, - 1575992506.47608], - [loc('extend_unifiedlogger.py'), - {'attrib-starts': [], - 'code-line': 'import xml.etree.ElementTree as ET\n', - 'first-line': 0L, - 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 0L, - 'selection_start': 0L, - 'zoom': 0L}, - 1575992565.713171], - [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': 575L, - 'folded-linenos': [], - 'sel-line': 606L, - 'sel-line-start': 22028L, - 'selection_end': 22028L, - 'selection_start': 22028L, - 'zoom': 0L}, - 1575992592.926503], - [loc('extend_unifiedlogger.py'), - {'attrib-starts': [], - 'code-line': 'for script_event in root:\n', - 'first-line': 16L, - 'folded-linenos': [], - 'sel-line': 24L, - 'sel-line-start': 759L, - 'selection_end': 759L, - 'selection_start': 759L, - 'zoom': 0L}, - 1575993280.146251], - [loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'), - {'attrib-starts': [('Element|0|', - 170), - ('Element|0|.__getitem__|0|', - 76)], - 'code-line': ' return self._children[index]\n', - 'first-line': 152L, - 'folded-linenos': [], - 'sel-line': 265L, - 'sel-line-start': 8855L, - 'selection_end': 8855L, - 'selection_start': 8855L, - 'zoom': 0L}, - 1575993294.116046], - [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': 575L, - 'folded-linenos': [], - 'sel-line': 606L, - 'sel-line-start': 22028L, - 'selection_end': 22028L, - 'selection_start': 22028L, - 'zoom': 0L}, - 1575993296.639257], - [loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'), - {'attrib-starts': [('Element|0|', - 170), - ('Element|0|.__getitem__|0|', - 76)], - 'code-line': ' return self._children[index]\n', - 'first-line': 152L, - 'folded-linenos': [], - 'sel-line': 265L, - 'sel-line-start': 8855L, - 'selection_end': 8855L, - 'selection_start': 8855L, - 'zoom': 0L}, - 1575993297.661174], - [loc('extend_unifiedlogger.py'), - {'attrib-starts': [], - 'code-line': ' for info_type in script_event:\n', - 'first-line': 15L, - 'folded-linenos': [], - 'sel-line': 27L, - 'sel-line-start': 879L, - 'selection_end': 879L, - 'selection_start': 879L, - 'zoom': 0L}, - 1575993810.141825], + 1575993810.141825], [loc('../../../../../../../../usr/lib/python2.7/xml/etree/ElementTree.py'), {'attrib-starts': [('Element|0|', @@ -453,7 +300,166 @@ 'selection_start': 51967L, 'zoom': 0L}, - 1576776077.910363]], + 1576776077.910363], + [loc('extend_unifiedlogger.py'), + {'attrib-starts': [], + 'code-line': ' entry_incinum = " CAD Log, Incident '\ + '#" + incident_num\n', + 'first-line': 30L, + 'folded-linenos': [], + 'sel-line': 33L, + 'sel-line-start': 1205L, + 'selection_end': 1246L, + 'selection_start': 1246L, + 'zoom': 0L}, + 1577393253.005358], + [loc('logging_service.py'), + {'attrib-starts': [('toHMS|0|', + 7)], + 'code-line': ' return "%02d:%02d:%02d" % (h, m, s) \n', + 'first-line': 42L, + 'folded-linenos': [], + 'sel-line': 10L, + 'sel-line-start': 281L, + 'selection_end': 297L, + 'selection_start': 297L, + 'zoom': 0L}, + 1577393417.740925], + [loc('extend_unifiedlogger.py'), + {'attrib-starts': [], + 'code-line': 'out_file = open(logfilepath + "caddetails.csv", "w")'\ + '\n', + 'first-line': 51L, + 'folded-linenos': [], + 'sel-line': 57L, + 'sel-line-start': 2692L, + 'selection_end': 2700L, + 'selection_start': 2692L, + 'zoom': 0L}, + 1577394088.002284], + [loc('extend_unifiedlogger.py'), + {'attrib-starts': [], + 'code-line': '\n', + 'first-line': 42L, + 'folded-linenos': [], + 'sel-line': 62L, + 'sel-line-start': 2871L, + 'selection_end': 2871L, + 'selection_start': 2871L, + 'zoom': 0L}, + 1577399854.843249], + [loc('logging_service.py'), + {'attrib-starts': [], + 'code-line': "if __name__ == '__main__':\n", + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 80L, + 'sel-line-start': 2695L, + 'selection_end': 2735L, + 'selection_start': 2695L, + 'zoom': 0L}, + 1577400145.321379], + [loc('extract_caddetails.py'), + {'attrib-starts': [], + 'code-line': ' startup()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 62L, + 'sel-line-start': 2826L, + 'selection_end': 2839L, + 'selection_start': 2839L, + 'zoom': 0L}, + 1577400164.213804], + [loc('__main__.py'), + {'attrib-starts': [('main|0|', + 2)], + 'code-line': 'def main():\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 2L, + 'sel-line-start': 134L, + 'selection_end': 145L, + 'selection_start': 134L, + 'zoom': 0L}, + 1577400181.955552], + [loc('extract_caddetails.py'), + {'attrib-starts': [], + 'code-line': ' extract()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 62L, + 'sel-line-start': 3068L, + 'selection_end': 3079L, + 'selection_start': 3079L, + 'zoom': 0L}, + 1577400309.516676], + [loc('__main__.py'), + {'attrib-starts': [('main|0|', + 2)], + 'code-line': 'def main():\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 2L, + 'sel-line-start': 134L, + 'selection_end': 145L, + 'selection_start': 134L, + 'zoom': 0L}, + 1577400449.642736], + [loc('extract_caddetails.py'), + {'attrib-starts': [], + 'code-line': ' extract()\n', + 'first-line': 54L, + 'folded-linenos': [], + 'sel-line': 62L, + 'sel-line-start': 3068L, + 'selection_end': 3079L, + 'selection_start': 3079L, + 'zoom': 0L}, + 1577400694.441992], + [loc('__main__.py'), + {'attrib-starts': [], + 'code-line': "if __name__ == '__main__':\n", + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 13L, + 'sel-line-start': 556L, + 'selection_end': 593L, + 'selection_start': 556L, + 'zoom': 0L}, + 1577400713.516774], + [loc('extract_caddetails.py'), + {'attrib-starts': [], + 'code-line': ' main()\n', + 'first-line': 48L, + 'folded-linenos': [], + 'sel-line': 62L, + 'sel-line-start': 3065L, + 'selection_end': 3073L, + 'selection_start': 3073L, + 'zoom': 0L}, + 1577401207.628608], + [loc('__main__.py'), + {'attrib-starts': [], + 'code-line': "if __name__ == '__main__':\n", + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 13L, + 'sel-line-start': 556L, + 'selection_end': 593L, + 'selection_start': 556L, + 'zoom': 0L}, + 1577401209.827539], + [loc('extract_caddetails.py'), + {'attrib-starts': [], + 'code-line': ' main()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 62L, + 'sel-line-start': 3065L, + 'selection_end': 3073L, + 'selection_start': 3073L, + 'zoom': 0L}, + 1577401579.928]], 20), - 'current-loc': loc('extend_unifiedlogger.py'), + 'current-loc': loc('__main__.py'), 'editor-state-list': [(loc('activitylog_watcher.py'), {'attrib-starts': [('readFile|0|', @@ -467,14 +473,4 @@ 'selection_end': 857L, 'selection_start': 857L, - 'zoom': 0L}), - (loc('extend_unifiedlogger.py'), - {'attrib-starts': [], - 'code-line': 'out_file.close()\n', - 'first-line': 51L, - 'folded-linenos': [], - 'sel-line': 69L, - 'sel-line-start': 3068L, - 'selection_end': 3085L, - 'selection_start': 3068L, 'zoom': 0L}), (loc('../../../config/logging_service.cfg'), @@ -490,45 +486,40 @@ 'zoom': 0L}), (loc('logging_service.py'), - {'attrib-starts': [('getSimTime|0|', - 13)], - 'code-line': ' print "Proceeding with '\ - 'previous time: ", toHMS(seconds)\n', + {'attrib-starts': [], + 'code-line': "if __name__ == '__main__':\n", 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 21L, - 'sel-line-start': 649L, - 'selection_end': 649L, - 'selection_start': 649L, + 'sel-line': 80L, + 'sel-line-start': 2695L, + 'selection_end': 2735L, + 'selection_start': 2695L, 'zoom': 0L}), (loc('__main__.py'), {'attrib-starts': [], - 'code-line': 'import logging_service, os, Co'\ - 'nfigParser\n', + 'code-line': "if __name__ == '__main__':\n", 'first-line': 0L, 'folded-linenos': [], - 'sel-line': 0L, - 'sel-line-start': 0L, - 'selection_end': 40L, - 'selection_start': 28L, + 'sel-line': 13L, + 'sel-line-start': 556L, + 'selection_end': 593L, + 'selection_start': 556L, 'zoom': 0L})], 'has-focus': True, 'locked': False}, [loc('activitylog_watcher.py'), - loc('extend_unifiedlogger.py'), loc('../../../config/logging_service.cfg'), loc('logging_service.py'), loc('__main__.py')]), 'open_files': [u'../../../config/logging_service.cfg', - u'__main__.py', u'activitylog_watcher.py', u'logging_service.py', - u'extend_unifiedlogger.py']}, + u'__main__.py']}, 'saved_notebook_display': None, 'split_percents': {0: 0.5}, 'splits': 2, 'tab_location': 'top', - 'traversal_pos': ((0, - 3), - 1576777529.191873), + 'traversal_pos': ((1, + 2), + 1577400521.436669), 'user_data': {}}, 'saved_notebook_display': None, @@ -540,11 +531,10 @@ 1576038340.052804), 'user_data': {}}, - 'window-alloc': (29, - 0, - 1197, - 722)}]} -guimgr.recent-documents = [loc('extend_unifiedlogger.py'), + 'window-alloc': (1152, + 28, + 1127, + 724)}]} +guimgr.recent-documents = [loc('__main__.py'), loc('logging_service.py'), - loc('__main__.py'), loc('activitylog_watcher.py'), loc('../../../config/logging_service.cfg')] @@ -570,4 +560,22 @@ 'selection_end': 565L, 'selection_start': 565L, + 'zoom': 0L}, + loc('extend_unifiedlogger.py'): {'attrib-starts': [], + 'code-line': '\n', + 'first-line': 42L, + 'folded-linenos': [], + 'sel-line': 62L, + 'sel-line-start': 2871L, + 'selection_end': 2871L, + 'selection_start': 2871L, + 'zoom': 0L}, + loc('extract_caddetails.py'): {'attrib-starts': [], + 'code-line': ' main()\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 62L, + 'sel-line-start': 3065L, + 'selection_end': 3073L, + 'selection_start': 3073L, 'zoom': 0L}, loc('get_app_properties.py'): {'attrib-starts': [],