Changeset 561 in tmcsimulator

Timestamp:

01/16/2020 12:16:26 PM (6 years ago)

Author:

jdalbey

Message:

rename scripts folder to Scenarios. See #228

Location:

trunk

Files:

• Scenarios (moved) (moved from trunk/scripts)
• bin/systemstart_dev_full_session.sh (modified) (1 diff)
• config/application_properties.cfg (modified) (1 diff)
• config/traffic_model_config/traffic_model_config.properties (modified) (1 diff)
• config/vds_data/sample_data/single_event_55S.txt (modified) (1 diff)
• src/python/unifiedlogger/wing_project.wpr (modified) (7 diffs)
• src/tmcsim/application.properties (modified) (1 diff)
• webapps/common/js/revision_number.dat (modified) (1 diff)
• webapps/dynamicdata/CADcomments.log (modified) (1 diff)

trunk/bin/systemstart_dev_full_session.sh

@@ -4 +4 @@
 cd ../webapps
 # Delete any existing CADcomments.log
-del dynamicdata/CADcomments.log
-# Delete start the local webserver
+rm dynamicdata/CADcomments.log
+#  start the local webserver
 echo "Starting webserver in folder" `pwd`
 python -m CGIHTTPServer 8080 &

trunk/config/application_properties.cfg

@@ -1 +1 @@
 
 [Versions]
-revision_number = 531
+revision_number = 557
     

trunk/config/traffic_model_config/traffic_model_config.properties

@@ -1 +1 @@
 Highways_Map_File = config/vds_data/postmile_coordinates.txt
 #Highways_Map_File = config/vds_data/highways_fullmap.txt
-#Events_File = config/vds_data/single_event_55S.txt
+#Events_File = config/vds_data/sample_data/single_event_55S.txt
 Events_File = config/vds_data/sample_data/atmsBatchEvents_production.txt
 #FEPSim_IP_addr = 192.168.251.46

trunk/config/vds_data/sample_data/single_event_55S.txt

@@ -1 @@
-# A test case for a map with just 55 South start at pm 3 and go 10 miles
+# A test case for a map with just 55 South start at postmile 3 and go 10 miles
 181 00:00:05  55 S 3.0 10.0 Y
+# A test case with a second event happening at the same time - works!
+181 00:00:05  55 N 13.0 10.0 R
 
+

trunk/src/python/unifiedlogger/wing_project.wpr

@@ -225 +225 @@
                        'toolbox-percent': 1.0,
                        '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,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[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': 256L,
          'folded-linenos': [],
-         'sel-line': 27L,
-         'sel-line-start': 879L,
-         'selection_end': 879L,
-         'selection_start': 879L,
+         'sel-line': 265L,
+         'sel-line-start': 8855L,
+         'selection_end': 8855L,
+         'selection_start': 8855L,
          'zoom': 0L},
-        1575993810.141825],
-        [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': 256L,
-          'folded-linenos': [],
-          'sel-line': 265L,
-          'sel-line-start': 8855L,
-          'selection_end': 8855L,
-          'selection_start': 8855L,
-          'zoom': 0L},
-         1575993818.095502],
+        1575993818.095502],
         [loc('extend_unifiedlogger.py'),
          {'attrib-starts': [],
@@ -459 +448 @@
           'selection_start': 3073L,
           'zoom': 0L},
-         1577401579.928]],
+         1577401579.928],
+        [loc('__main__.py'),
+         {'attrib-starts': [],
+          'code-line': "if __name__ == '__main__':\n",
+          'first-line': 14L,
+          'folded-linenos': [],
+          'sel-line': 13L,
+          'sel-line-start': 556L,
+          'selection_end': 593L,
+          'selection_start': 556L,
+          'zoom': 0L},
+         1577405755.47867]],
         20),
-        'current-loc': loc('__main__.py'),
+        'current-loc': loc('extract_caddetails.py'),
         'editor-state-list': [(loc('activitylog_watcher.py'),
                                {'attrib-starts': [('readFile|0|',
@@ -473 +473 @@
                                 'selection_end': 857L,
                                 'selection_start': 857L,
+                                'zoom': 0L}),
+                              (loc('extract_caddetails.py'),
+                               {'attrib-starts': [],
+                                'code-line': '#          Move unifiedlogger.'\
+        'zip from deploy folder to webapps folder.\n',
+                                'first-line': 0L,
+                                'folded-linenos': [],
+                                'sel-line': 6L,
+                                'sel-line-start': 246L,
+                                'selection_end': 317L,
+                                'selection_start': 317L,
                                 'zoom': 0L}),
                               (loc('../../../config/logging_service.cfg'),
@@ -498 +509 @@
                                {'attrib-starts': [],
                                 'code-line': "if __name__ == '__main__':\n",
-                                'first-line': 0L,
+                                'first-line': 14L,
                                 'folded-linenos': [],
                                 'sel-line': 13L,
@@ -508 +519 @@
         'locked': False},
         [loc('activitylog_watcher.py'),
+         loc('extract_caddetails.py'),
          loc('../../../config/logging_service.cfg'),
          loc('logging_service.py'),
@@ -514 +526 @@
         u'activitylog_watcher.py',
         u'logging_service.py',
-        u'__main__.py']},
+        u'__main__.py',
+        u'extract_caddetails.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.5},
@@ -532 +545 @@
                  'user_data': {}},
         'window-alloc': (1152,
-                         28,
+                         30,
                          1127,
-                         724)}]}
-guimgr.recent-documents = [loc('__main__.py'),
+                         726)}]}
+guimgr.recent-documents = [loc('extract_caddetails.py'),
+                           loc('__main__.py'),
                            loc('logging_service.py'),
                            loc('activitylog_watcher.py'),

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 26 Dec 2019 16:40:02 -0800
+#Thu, 16 Jan 2020 13:47:21 -0800
 
-Application.revision=549
+Application.revision=557
 
-Application.buildnumber=202
+Application.buildnumber=205

trunk/webapps/common/js/revision_number.dat

@@ -1 +1 @@
 
-    var revisionNumber = "554";
+    var revisionNumber = "557";
     

trunk/webapps/dynamicdata/CADcomments.log

@@ -1 @@
-CAD Log, Simulation Started at 15 Jan 2020 14:14:29 with incidents 100 187 188 189 190 191 
+CAD Log, Simulation Started at 16 Jan 2020 13:49:21 with incidents 100 187 188 189 190 191