Changeset 80 in tmcsimulator for branches


Ignore:
Timestamp:
10/05/2017 03:04:40 PM (9 years ago)
Author:
jtorres
Message:

Renamed project. Renamed LDS_LOOP to STATION.

Location:
branches/FEPSimulator
Files:
2 edited
26 copied
1 moved

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/DataPacker.cpp

    r79 r80  
    33unsigned char * DataPacker::msg; 
    44 
    5 unsigned char * DataPacker::packData(LDS_LOOP *station) { 
     5unsigned char * DataPacker::packData(STATION *station) { 
    66    int pos = 26; 
    77    DataPacker packer; 
    … …  
    3838} 
    3939 
    40 int DataPacker::dynamicDataPack(LDS_LOOP *station, int packNo, int pos) { 
     40int DataPacker::dynamicDataPack(STATION *station, int packNo, int pos) { 
    4141    int i, j, vol, occ, haveData; 
    4242    //used for data byte 23 and 24 
    … …  
    8585} 
    8686 
    87 unsigned char * DataPacker::staticDataPack(LDS_LOOP *station) { 
     87unsigned char * DataPacker::staticDataPack(STATION *station) { 
    8888    int j; 
    8989    // Allocate memory for dataPack 

  • branches/FEPSimulator/DataPacker.h

    r79 r80  
    2727     * @return The packed data message 
    2828     */ 
    29     static unsigned char * packData(LDS_LOOP *station); 
     29    static unsigned char * packData(STATION *station); 
    3030 
    3131private: 
    3232    static unsigned char *msg; 
    3333    // Packs the static data in message sent to ATMS 
    34     unsigned char * staticDataPack(LDS_LOOP *station); 
     34    unsigned char * staticDataPack(STATION *station); 
    3535    // Packs dynamic data in message sent to ATMS 
    36     int dynamicDataPack(LDS_LOOP *station, int packNo, int pos); 
     36    int dynamicDataPack(STATION *station, int packNo, int pos); 
    3737    // Sets last byte of message 
    3838    char chksum(unsigned char *dataptr, int len); 

  • branches/FEPSimulator/FEPClient.cpp

    r79 r80  
    4343 
    4444    vector<FEP_LINE*> lines = networkReader->getLines(); 
    45     vector<LDS_LOOP*> ldsMap = networkReader->getStations(); 
     45    vector<STATION*> ldsMap = networkReader->getStations(); 
    4646 
    4747    // Send one reply for every "line" in the FEP 

  • branches/FEPSimulator/NetworkReader.cpp

    r79 r80  
    2929 
    3030/** 
    31  * Parses a station xml element into an "LDS_LOOP" 
     31 * Parses a station xml element into an "STATION" 
    3232 *  
    3333 * @param stationElem the station xml element 
    … …  
    3535 * @return the new station 
    3636 */ 
    37 LDS_LOOP * NetworkReader::parseStation(TiXmlElement *stationElem, FEP_LINE *line) { 
    38     LDS_LOOP *station = new LDS_LOOP; 
     37STATION * NetworkReader::parseStation(TiXmlElement *stationElem, FEP_LINE *line) { 
     38    STATION *station = new STATION; 
    3939     
    4040    TiXmlElement *stationSubElem = stationElem->FirstChildElement(); 
    … …  
    140140/** 
    141141 * Getter for stations 
    142  * @return List of LDS_LOOPs 
     142 * @return List of STATIONs 
    143143 */ 
    144 vector<LDS_LOOP*> NetworkReader::getStations() { 
     144vector<STATION*> NetworkReader::getStations() { 
    145145 
    146146    return stations; 

  • branches/FEPSimulator/NetworkReader.h

    r79 r80  
    66 *  
    77 * A NetworkReader contains two public methods 'getLines' and 'getLoops', 
    8  * which are getters for the list of FEP_LINES, and LDS_LOOPS, respectively. 
     8 * which are getters for the list of FEP_LINES, and STATIONS, respectively. 
    99 *  
    1010 * Example XML file: 
    … …  
    6565         
    6666        vector<FEP_LINE*> getLines(); // Getter for FEP_LINE list 
    67         vector<LDS_LOOP*> getStations(); // Getter for LDS_LOOP list 
     67        vector<STATION*> getStations(); // Getter for STATION list 
    6868    private: 
    6969        vector<FEP_LINE*> lines; 
    70         vector<LDS_LOOP*> stations; 
     70        vector<STATION*> stations; 
    7171        int ldsIndex; 
    7272 
    7373        void loadLines(const char * networkFileName); 
    7474        LOOP * parseLoop(TiXmlElement * loopElem); 
    75         LDS_LOOP * parseStation(TiXmlElement *stationElem, FEP_LINE *line); 
     75        STATION * parseStation(TiXmlElement *stationElem, FEP_LINE *line); 
    7676        FEP_LINE * parseLine(TiXmlElement *lineElem); 
    7777}; 

  • branches/FEPSimulator/nbproject/private/configurations.xml

    r78 r80  
    1414          <gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/> 
    1515        </gdb_interceptlist> 
    16         <gdb_signals> 
    17         </gdb_signals> 
    1816        <gdb_options> 
    1917          <DebugOptions> 

  • branches/FEPSimulator/nbproject/project.xml

    r77 r80  
    44    <configuration> 
    55        <data xmlns="http://www.netbeans.org/ns/make-project/1"> 
    6             <name>fep_rpc_client</name> 
     6            <name>FEPSimulator</name> 
    77            <c-extensions>c</c-extensions> 
    88            <cpp-extensions>cpp</cpp-extensions> 

  • branches/FEPSimulator/network.h

    r79 r80  
    5050 
    5151// Loop detector station: has several loops 
    52 typedef struct Lds_loop LDS_LOOP; 
    53 struct  Lds_loop 
     52typedef struct Station STATION; 
     53struct  Station 
    5454{ 
    5555        // Each lds has its own line_num and drop (Caltrans use) 
Note: See TracChangeset for help on using the changeset viewer.