Changeset 465 in tmcsimulator for trunk/src/python/unifiedlogger

Timestamp:

07/26/2019 05:12:05 AM (7 years ago)

Author:

jdalbey

Message:

Coordinator.java: Update writeToCAD to sort comments by timestamp instead of incident number. Also add a unit test for this. Fixes #175.

File:

• trunk/src/python/unifiedlogger/wing_project.wpr (modified) (6 diffs)

trunk/src/python/unifiedlogger/wing_project.wpr

@@ -183 +183 @@
                        'toolbox-percent': 1.0,
                        'toolbox-tree-sel': ''})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('logging_service.py'),
-        {'attrib-starts': [('getSimTime|0|',
-                            7)],
-         'code-line': '       print "Error loading json for elapsed time"\n',
-         'first-line': 0L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('activitylog_watcher.py'),
+        {'attrib-starts': [],
+         'code-line': '# Local main for unit testing\n',
+         'first-line': 48L,
          'folded-linenos': [],
-         'sel-line': 14L,
-         'sel-line-start': 410L,
-         'selection_end': 460L,
-         'selection_start': 460L,
+         'sel-line': 50L,
+         'sel-line-start': 1431L,
+         'selection_end': 1460L,
+         'selection_start': 1460L,
          'zoom': 0L},
-        1563914714.187541],
-        [loc('cad_watcher.py'),
-         {'attrib-starts': [('isFull|0|',
-                             16)],
-          'code-line': '\n',
-          'first-line': 18L,
-          'folded-linenos': [],
-          'sel-line': 18L,
-          'sel-line-start': 559L,
-          'selection_end': 559L,
-          'selection_start': 559L,
-          'zoom': 0L},
-         1563914983.485065],
-        [loc('activitylog_watcher.py'),
-         {'attrib-starts': [],
-          'code-line': '# Local main for unit testing\n',
-          'first-line': 48L,
-          'folded-linenos': [],
-          'sel-line': 50L,
-          'sel-line-start': 1431L,
-          'selection_end': 1460L,
-          'selection_start': 1460L,
-          'zoom': 0L},
-         1563915276.741928],
+        1563915276.741928],
         [loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'),
          {'attrib-starts': [('ConfigParser|0|',
@@ -422 +398 @@
           'selection_start': 565L,
           'zoom': 0L},
-         1563916220.372856]],
+         1563916220.372856],
+        [loc('activitylog_watcher.py'),
+         {'attrib-starts': [('getLogEntries|0|',
+                             42)],
+          'code-line': '    resultList = []\n',
+          'first-line': 40L,
+          'folded-linenos': [],
+          'sel-line': 48L,
+          'sel-line-start': 1422L,
+          'selection_end': 1422L,
+          'selection_start': 1422L,
+          'zoom': 0L},
+         1564099965.745285],
+        [loc('cad_watcher.py'),
+         {'attrib-starts': [('isFull|0|',
+                             16)],
+          'code-line': '\n',
+          'first-line': 3L,
+          'folded-linenos': [],
+          'sel-line': 18L,
+          'sel-line-start': 559L,
+          'selection_end': 559L,
+          'selection_start': 559L,
+          'zoom': 0L},
+         1564102192.752733]],
         20),
-        'current-loc': loc('activitylog_watcher.py'),
+        'current-loc': loc('__main__.py'),
         'editor-state-list': [(loc('activitylog_watcher.py'),
                                {'attrib-starts': [('getLogEntries|0|',
@@ -440 +440 @@
         16)],
                                 'code-line': '\n',
-                                'first-line': 18L,
+                                'first-line': 3L,
                                 'folded-linenos': [],
                                 'sel-line': 18L,
@@ -500 +500 @@
          loc('__main__.py')]),
                                'open_files': [u'../../../config/logging_service.cfg',
-        u'__main__.py',
-        u'cad_watcher.py',
         u'cms_watcher.py',
         u'logging_service.py',
-        u'activitylog_watcher.py']},
+        u'activitylog_watcher.py',
+        u'cad_watcher.py',
+        u'__main__.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.5},
@@ -519 +519 @@
                  'traversal_pos': ((0,
                                     4),
-                                   1563917662.000223),
+                                   1564102198.163837),
                  'user_data': {}},
         'window-alloc': (29,
@@ -525 +525 @@
                          1197,
                          722)}]}
-guimgr.recent-documents = [loc('activitylog_watcher.py'),
+guimgr.recent-documents = [loc('__main__.py'),
+                           loc('cad_watcher.py'),
+                           loc('activitylog_watcher.py'),
                            loc('logging_service.py'),
                            loc('cms_watcher.py'),
-                           loc('__main__.py'),
-                           loc('cad_watcher.py'),
                            loc('../../../config/logging_service.cfg')]
 guimgr.visual-state = {loc('get_app_properties.py'): {'attrib-starts': [],