Changeset 650 in tmcsimulator


Ignore:
Timestamp:
09/07/2022 12:22:34 PM (4 years ago)
Author:
jdalbey
Message:

Multiple updates - catchup webapps files I've been hoarding (sorry).

Location:
trunk
Files:
5 added
1 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/IDE_metadata/NetBeans/TMCSim/nbproject/build-impl.xml

    r521 r650  
    128128        <condition property="have.sources"> 
    129129            <or> 
     130                <available file="${src.webapps.dir}"/> 
    130131                <available file="${src.dir}"/> 
    131132            </or> 
    … …  
    231232    </target> 
    232233    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check"> 
     234        <fail unless="src.webapps.dir">Must set src.webapps.dir</fail> 
    233235        <fail unless="src.dir">Must set src.dir</fail> 
    234236        <fail unless="test.src.dir">Must set test.src.dir</fail> 
    … …  
    253255    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> 
    254256        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> 
    255             <attribute default="${src.dir}" name="srcdir"/> 
     257            <attribute default="${src.webapps.dir}:${src.dir}" name="srcdir"/> 
    256258            <attribute default="${build.classes.dir}" name="destdir"/> 
    257259            <attribute default="${javac.classpath}" name="classpath"/> 
    … …  
    294296    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> 
    295297        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> 
    296             <attribute default="${src.dir}" name="srcdir"/> 
     298            <attribute default="${src.webapps.dir}:${src.dir}" name="srcdir"/> 
    297299            <attribute default="${build.classes.dir}" name="destdir"/> 
    298300            <attribute default="${javac.classpath}" name="classpath"/> 
    … …  
    327329    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> 
    328330        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> 
    329             <attribute default="${src.dir}" name="srcdir"/> 
     331            <attribute default="${src.webapps.dir}:${src.dir}" name="srcdir"/> 
    330332            <attribute default="${build.classes.dir}" name="destdir"/> 
    331333            <attribute default="${javac.classpath}" name="classpath"/> 
    … …  
    925927            </dirset> 
    926928        </pathconvert> 
    927         <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/> 
     929        <j2seproject3:depend srcdir="${src.webapps.dir}:${src.dir}:${build.generated.subdirs}"/> 
    928930    </target> 
    929931    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile"> 
    930932        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/> 
    931933        <copy todir="${build.classes.dir}"> 
     934            <fileset dir="${src.webapps.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> 
    932935            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> 
    933936        </copy> 
    … …  
    951954        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 
    952955        <j2seproject3:force-recompile/> 
    953         <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/> 
     956        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.webapps.dir}:${src.dir}"/> 
    954957    </target> 
    955958    <target name="-post-compile-single"> 
    … …  
    12171220                <path path="${javac.classpath}"/> 
    12181221            </classpath> 
     1222            <fileset dir="${src.webapps.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> 
     1223                <filename name="**/*.java"/> 
     1224            </fileset> 
    12191225            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> 
    12201226                <filename name="**/*.java"/> 
    … …  
    12271233        </javadoc> 
    12281234        <copy todir="${dist.javadoc.dir}"> 
     1235            <fileset dir="${src.webapps.dir}" excludes="${excludes}" includes="${includes}"> 
     1236                <filename name="**/doc-files/**"/> 
     1237            </fileset> 
    12291238            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> 
    12301239                <filename name="**/doc-files/**"/> 

  • trunk/IDE_metadata/NetBeans/TMCSim/nbproject/genfiles.properties

    r521 r650  
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    6 nbproject/build-impl.xml.data.CRC32=6c7221c6 
    7 nbproject/build-impl.xml.script.CRC32=249c9218 
     6nbproject/build-impl.xml.data.CRC32=2baad00b 
     7nbproject/build-impl.xml.script.CRC32=0dba3c5c 
    88nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 

  • trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties

    r523 r650  
    33file.reference.json-simple-1.1.jar=../../../lib/json-simple-1.1.jar 
    44file.reference.SimTimeSelector_r28.jar=../../../lib/SimTimeSelector_r28.jar 
     5file.reference.trunk-webapps=../../../webapps 
    56file.reference.xercesImpl.jar=../../../lib/xercesImpl.jar 
    67javac.deprecation=false 
    … …  
    2728source.encoding=UTF-8 
    2829javadoc.author=true 
     30src.webapps.dir=${file.reference.trunk-webapps} 
    2931test.src.dir=${file.reference.tmc-simulator-test} 
    3032build.dir=build 

  • trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.xml

    r79 r650  
    66            <name>TMCSim</name> 
    77            <source-roots> 
     8                <root id="src.webapps.dir" name="webapps"/> 
    89                <root id="src.dir"/> 
    910            </source-roots> 

  • trunk/src/tmcsim/client/cadclientgui/data/CADDataSpike.java

    r476 r650  
     1package tmcsim.client.cadclientgui.data; 
     2 
    13 
    24import java.util.Vector; 

  • trunk/webapps/common/js/displayutils.js

    r643 r650  
    3030} 
    3131 
     32// Format the csv data into an HTML table 
    3233function formatTable(allRows, sortOrder) 
    3334{ 
    … …  
    3536    if (sortOrder) // ascending order of time (most recent last) 
    3637    { 
    37         // Format the csv data into an HTML table 
    3838        // Put the last log entry at the BOTTOM of the table 
    3939        for (var singleRow = 0; singleRow <= allRows.length-1; singleRow++) 
    … …  
    4646    else  // descending order of time (most recent first) 
    4747    { 
    48         // Format the csv data into an HTML table 
    4948        // Put the last log entry at the TOP of the table 
    5049        for (var singleRow = allRows.length-1; singleRow >= 0; singleRow--) 
    … …  
    6059} 
    6160 
     61// Format a single row of fields into a table row 
    6262function formatRow(rowCells) 
    6363{ 

  • trunk/webapps/common/js/revision_number.dat

    r643 r650  
    11 
    2     var revisionNumber = "640"; 
     2    var revisionNumber = "649"; 
    33     

  • trunk/webapps/cptms/css/styles.css

    r404 r650  
    106106        } 
    107107       .wrapper { 
    108            position: relative;\ 
     108           position: relative; 
    109109        } 
    110110        /* CMS Edit Message Dialog */ 

  • trunk/webapps/cptms/images/CCTV

    • Property svn:ignore set to
      Thumbs.db

  • trunk/webapps/dynamicdata/CADcomments.log

    r643 r650  
    1 CAD Log, Simulation Started at 14 Mar 2021 11:28:27 with incidents 100 181  
    21CAD Log, Simulation Paused. 

  • trunk/webapps/dynamicdata/cms_messages.json

    r643 r650  
    88{"cms":{"index":"16","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
    99{"cms":{"index":"17","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
    10 {"cms":{"index":"18","message":{"displayTime":"","phase1":{"Line1":"BBBBB","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
     10{"cms":{"index":"18","message":{"displayTime":"","phase1":{"Line1":"DRIVE SAFE","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
    1111{"cms":{"index":"19","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 
    1212{"cms":{"index":"20","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}}, 

  • trunk/webapps/dynamicdata/data.json

    r643 r650  
    44["20190207-001","02\/07","13:23.07","Gross, Angelo","","HCC NOTIFIED"], 
    55["20190207-001","02\/07","13:23.59","Gross, Angelo","","32-1 Vehicle Disabled S 55@ 405 1308 hours"], 
    6 ["20190207-021","02\/07","16:05.11","","10-98 Assignment Completed","75-1"], 
    7 ["20190207-021","02\/07","16:05.16","","10-98 Let's get pizza.","75-1"], 
    8 ["20190207-021","02\/07","16:07.21","","10-97 Tomatoes everywhere.","75-1"], 
    9 ["20190207-021","02\/07","16:07.21","","10-97 Tribbles everywhere.","75-1"] 
     6["20190207-021","02\/07","16:05.11","Smith, Bob","10-98 Assignment Completed","75-1"], 
     7["20190207-021","02\/07","16:05.16","Jones, Mary","10-98 Let's get pizza.","75-1"], 
     8["20190207-021","02\/07","16:07.21","Tsu, Lao","10-97 Tomatoes everywhere.","75-1"], 
     9["20190207-021","02\/07","16:07.21","Barry, Dave","10-97 Tribbles everywhere.","75-1"], 
     10["20190207-021","02\/07","16:07.21","Jones, Mary","10-97 Doritos everywhere.","75-1"] 
    1011] 
    1112} 

  • trunk/webapps/dynamicdata/data_summary.json

    r547 r650  
    1 {"data":[["20191001-001","10\/01","15:05.53","Bailey, Mary","I-5","","","Advisory","Advisory: National Weather Service Advisory",""],["20191001-002","10\/01","16:03.47","Hockaday, Neil","I-405","Jeffrey","SB","Major","Major: 11-79 Accident-Ambulance Rolling","Ducks"],["20191001-002","10\/01","16:03.47","Quan, Ally","I-405","Jeffrey","SB","Major","Major: 11-79 Accident-Ambulance Rolling","Ducks"]]} 
     1{"data":[["20191001-001","10\/01","15:05.53","Bailey, Mary","I-5","","","Advisory","Advisory: National Weather Service Advisory",""],["20191001-002","10\/01","16:03.47","Hockaday, Neil","I-405","Jeffrey","SB","Major","Major: 11-79 Accident-Ambulance Rolling","Ducks"], 
     2["20191001-002","10\/01","16:03.47","Quan, Ally","I-405","Jeffrey","SB","Major","Major: 11-79 Accident-Ambulance Rolling","Ducks"], 
     3["20191001-002","10\/01","16:03.47","Buck, Joe","I-405","Jeffrey","SB","Major","Major: 11-79 Party-Tailgate down","Pigs"] 
     4]} 

  • trunk/webapps/dynamicdata/har_messages.json

    r551 r650  
    11{"data":[ 
    2 {"har":{"index":"WPMW407 1620 AM","message":{"displayTime":"","phase1":{"Line1":"GOOD NIGHT"}}}}, 
    3 {"har":{"index":"KNNN868 1620 AM","message":{"displayTime":"","phase1":{"Line1":"SAMPLE HAR MESSAGE"}}}} 
     2{"har":{"index":"WPMW407 1620 AM","message":{"displayTime":"","phase1":{"Line1":"NOW IS THE TIME FOR ALL GOOD MEN TO COME TO THE AID OF THEIR COUNTRY\nASK NOT WHAT YOUR COUNTRY CAN DO FOR YOU ASK WHAT YOU CAN DO FOR YOUR COUNTRY."}}}}, 
     3{"har":{"index":"KNNN868 1620 AM","message":{"displayTime":"","phase1":{"Line1":"SAMPLE HAR MESSAGE\nSAMPLE HAR MESSAGE\nSAMPLE HAR MESSAGE\nSAMPLE HAR MESSAGE"}}}} 
    44]} 

  • trunk/webapps/dynamicdata/highway_status.json

    r643 r650  
    1203512035       }, 
    1203612036   "properties":  
    12037        {"street": "MACARTHUR 1", "color": "red", "perpx": "0.408917", "perpy": "0.912572"} 
     12037       {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"} 
    1203812038},   
    1203912039{ 

  • trunk/webapps/dynamicdata/unifiedlog.csv

    r643 r650  
    1 00:10:18, CMS Activated,N SR-55  5.38 Baker Street, 'BBBBB:::::' 
    2 00:10:18, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:' 
    3 00:10:18, CMS Activated,S SR-55  8.64 WARNER AVE, 'ACCIDENT AHEAD:::::' 
    4 00:10:18, CMS Activated,S I-405  4.06 JEFFREY, 'SLOW TRAFFIC:AHEAD::::' 
    5 00:10:18, CAD Log, Simulation Started at 14 Mar 2021 10:24:44 with incidents 100 187 188 189 190 191 
    6 00:10:18, Activity Log,Ha Khanh Duy,001  Per 32-1 NB rte 405 blocked 
    7 00:10:18, Activity Log,Gross Angelo,001  HCC NOTIFIED 
    8 00:10:18, Activity Log,Gross Angelo,001  32-1 Vehicle Disabled S 55@ 405 1308 hours 
    9 00:10:18, Activity Log,,021 10-98 Assignment Completed 75-1 
    10 00:10:18, Activity Log,,021 10-98 Let's get pizza. 75-1 
    11 00:10:18, Activity Log,,021 10-97 Tomatoes everywhere. 75-1 
    12 00:10:18, Activity Log,,021 10-97 Tribbles everywhere. 75-1 
    13 00:10:18, Activity Log,Bailey Mary,001  Incident Created 
    14 00:10:18, Activity Log,Hockaday Neil,002  Incident Created 
    15 00:10:18, Activity Log,Quan Ally,002  Incident Created 
    16 00:00:32, CAD Log, Simulation Paused. 
     100:07:26, CMS Activated,N SR-55  5.38 Baker Street, 'DRIVE SAFE:::::' 
     200:07:26, CMS Activated,N I-405 15.18 MAGNOLIA ST, 'SLOW FOR THE::CONE ZONE:ROAD WORK:AHEAD:' 
     300:07:26, CMS Activated,S SR-55  8.64 WARNER AVE, 'ACCIDENT AHEAD:::::' 
     400:07:26, CMS Activated,S I-405  4.06 JEFFREY, 'SLOW TRAFFIC:AHEAD::::' 
     500:07:26, HAR Activated,WPMW407 1620 AM, 'NOW IS THE TIME FOR ALL GOOD MEN TO COME TO THE AID OF THEIR COUNTRY ASK NOT WHAT YOUR COUNTRY CAN DO FOR YOU ASK WHAT YOU CAN DO FOR YOUR COUNTRY.' 
     600:07:26, HAR Activated,KNNN868 1620 AM, 'SAMPLE HAR MESSAGE' 
     700:07:26, CAD Log, Simulation Started at 2 Sep 2022 15:34:26 with incidents 100 187 188 189 190 191 
     800:07:26, CAD Log, Simulation Paused. 
     900:07:26, Activity Log,Ha Khanh Duy,001  Per 32-1 NB rte 405 blocked 
     1000:07:26, Activity Log,Gross Angelo,001  HCC NOTIFIED 
     1100:07:26, Activity Log,Gross Angelo,001  32-1 Vehicle Disabled S 55@ 405 1308 hours 
     1200:07:26, Activity Log,Smith Bob,021 10-98 Assignment Completed 75-1 
     1300:07:26, Activity Log,Jones Mary,021 10-98 Let's get pizza. 75-1 
     1400:07:26, Activity Log,Tsu Lao,021 10-97 Tomatoes everywhere. 75-1 
     1500:07:26, Activity Log,Barry Dave,021 10-97 Tribbles everywhere. 75-1 
     1600:07:26, Activity Log,Jones Mary,021 10-97 Doritos everywhere. 75-1 
     1700:07:26, Activity Log,Bailey Mary,001  Incident Created 
     1800:07:26, Activity Log,Hockaday Neil,002  Incident Created 
     1900:07:26, Activity Log,Quan Ally,002  Incident Created 
     2000:07:26, Activity Log,Buck Joe,002  Incident Created 
     2100:07:26, HAR Updated, KNNN868 1620 AM, 'SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE SAMPLE HAR MESSAGE' 

  • trunk/webapps/visualizer/css/styles.css

    r516 r650  
    123123        } 
    124124       .wrapper { 
    125            position: relative;\ 
     125           position: relative; 
    126126        } 
    127127        /* CMS Edit Message Dialog */ 
Note: See TracChangeset for help on using the changeset viewer.