- Timestamp:
- 10/23/2017 03:56:44 PM (9 years ago)
- Location:
- trunk/src
- Files:
-
- 3 edited
-
atmsdriver/model/Station.java (modified) (2 diffs)
-
tmcsim/client/ATMSBatchViewer.form (modified) (6 diffs)
-
tmcsim/client/ATMSBatchViewer.java (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/atmsdriver/model/Station.java
r127 r168 72 72 for(LoopDetector loop : loops) 73 73 { 74 if(loop.loopLocation.startsWith("O P"))74 if(loop.loopLocation.startsWith("OS")) 75 75 { 76 76 oppTotVol += loop.vol; … … 154 154 public void updateByDirection(DIRECTION direction, DOTCOLOR dotColor) 155 155 { 156 String laneDir = "O PP";156 String laneDir = "OS"; 157 157 if(direction.equals(this.direction)) 158 158 { -
trunk/src/tmcsim/client/ATMSBatchViewer.form
r158 r168 26 26 <Group type="103" groupAlignment="0" attributes="0"> 27 27 <Group type="102" alignment="0" attributes="0"> 28 <Component id="pnlEvents" max="32767" attributes="0"/> 29 <EmptySpace max="-2" attributes="0"/> 30 </Group> 31 <Group type="102" alignment="0" attributes="0"> 32 <EmptySpace min="-2" pref="76" max="-2" attributes="0"/> 33 <Component id="pnlIncidents" min="-2" max="-2" attributes="0"/> 34 <EmptySpace max="32767" attributes="0"/> 28 <Group type="103" groupAlignment="1" max="-2" attributes="0"> 29 <Group type="102" alignment="0" attributes="0"> 30 <EmptySpace max="-2" attributes="0"/> 31 <Component id="jScrollPane1" min="-2" pref="211" max="-2" attributes="0"/> 32 <EmptySpace max="-2" attributes="0"/> 33 <Component id="pnlIncidents" max="32767" attributes="0"/> 34 </Group> 35 <Component id="pnlEvents" min="-2" max="-2" attributes="0"/> 36 </Group> 37 <EmptySpace min="0" pref="27" max="32767" attributes="0"/> 35 38 </Group> 36 39 </Group> … … 41 44 <Component id="pnlEvents" min="-2" max="-2" attributes="0"/> 42 45 <EmptySpace max="-2" attributes="0"/> 43 <Component id="pnlIncidents" max="32767" attributes="0"/> 46 <Group type="103" groupAlignment="0" attributes="0"> 47 <Component id="pnlIncidents" max="32767" attributes="0"/> 48 <Group type="102" attributes="0"> 49 <Component id="jScrollPane1" min="-2" pref="179" max="-2" attributes="0"/> 50 <EmptySpace min="0" pref="0" max="32767" attributes="0"/> 51 </Group> 52 </Group> 44 53 <EmptySpace max="-2" attributes="0"/> 45 54 </Group> … … 53 62 <DimensionLayout dim="0"> 54 63 <Group type="103" groupAlignment="0" attributes="0"> 55 <Group type="102" alignment="1" attributes="0"> 56 <EmptySpace pref="74" max="32767" attributes="0"/> 57 <Component id="scrollEvents" min="-2" pref="354" max="-2" attributes="0"/> 58 <EmptySpace min="-2" pref="59" max="-2" attributes="0"/> 59 </Group> 60 <Group type="102" alignment="0" attributes="0"> 61 <EmptySpace min="-2" pref="112" max="-2" attributes="0"/> 62 <Component id="txtClockTime" min="-2" pref="225" max="-2" attributes="0"/> 63 <EmptySpace max="32767" attributes="0"/> 64 <Group type="102" attributes="0"> 65 <Group type="103" groupAlignment="0" attributes="0"> 66 <Group type="102" attributes="0"> 67 <EmptySpace min="-2" pref="112" max="-2" attributes="0"/> 68 <Component id="txtClockTime" min="-2" pref="225" max="-2" attributes="0"/> 69 </Group> 70 <Group type="102" alignment="0" attributes="0"> 71 <EmptySpace max="-2" attributes="0"/> 72 <Component id="scrollEvents" min="-2" pref="430" max="-2" attributes="0"/> 73 </Group> 74 </Group> 75 <EmptySpace pref="20" max="32767" attributes="0"/> 64 76 </Group> 65 77 </Group> … … 118 130 <Group type="103" groupAlignment="0" attributes="0"> 119 131 <Group type="102" attributes="0"> 120 <Group type="103" groupAlignment="0" attributes="0"> 121 <Component id="btnClear" min="-2" max="-2" attributes="0"/> 122 <Component id="jScrollPane1" min="-2" pref="211" max="-2" attributes="0"/> 123 </Group> 124 <EmptySpace min="0" pref="173" max="32767" attributes="0"/> 132 <Component id="btnClear" min="-2" max="-2" attributes="0"/> 133 <EmptySpace min="0" pref="0" max="32767" attributes="0"/> 125 134 </Group> 126 135 </Group> … … 129 138 <Group type="103" groupAlignment="0" attributes="0"> 130 139 <Group type="102" alignment="1" attributes="0"> 131 <Component id="jScrollPane1" min="-2" pref="179" max="-2" attributes="0"/> 132 <EmptySpace max="-2" attributes="0"/> 140 <EmptySpace min="-2" pref="185" max="-2" attributes="0"/> 133 141 <Component id="btnClear" min="-2" max="-2" attributes="0"/> 134 142 <EmptySpace max="32767" attributes="0"/> … … 146 154 </Events> 147 155 </Component> 148 <Container class="javax.swing.JScrollPane" name="jScrollPane1"> 156 </SubComponents> 157 </Container> 158 <Container class="javax.swing.JScrollPane" name="jScrollPane1"> 159 <AuxValues> 160 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> 161 </AuxValues> 162 163 <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> 164 <SubComponents> 165 <Component class="javax.swing.JList" name="lstIncidents"> 166 <Properties> 167 <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> 168 <Font name="Noto Mono" size="15" style="0"/> 169 </Property> 170 <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor"> 171 <StringArray count="5"> 172 <StringItem index="0" value="Item 1"/> 173 <StringItem index="1" value="Item 2"/> 174 <StringItem index="2" value="Item 3"/> 175 <StringItem index="3" value="Item 4"/> 176 <StringItem index="4" value="Item 5"/> 177 </StringArray> 178 </Property> 179 <Property name="selectionMode" type="int" value="0"/> 180 </Properties> 149 181 <AuxValues> 150 <AuxValue name=" autoScrollPane" type="java.lang.Boolean" value="true"/>182 <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="<String>"/> 151 183 </AuxValues> 152 153 <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> 154 <SubComponents> 155 <Component class="javax.swing.JList" name="lstIncidents"> 156 <Properties> 157 <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> 158 <Font name="Noto Mono" size="15" style="0"/> 159 </Property> 160 <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor"> 161 <StringArray count="5"> 162 <StringItem index="0" value="Item 1"/> 163 <StringItem index="1" value="Item 2"/> 164 <StringItem index="2" value="Item 3"/> 165 <StringItem index="3" value="Item 4"/> 166 <StringItem index="4" value="Item 5"/> 167 </StringArray> 168 </Property> 169 <Property name="selectionMode" type="int" value="0"/> 170 </Properties> 171 <AuxValues> 172 <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="<String>"/> 173 </AuxValues> 174 </Component> 175 </SubComponents> 176 </Container> 184 </Component> 177 185 </SubComponents> 178 186 </Container> -
trunk/src/tmcsim/client/ATMSBatchViewer.java
r158 r168 93 93 pnlEventsLayout.setHorizontalGroup( 94 94 pnlEventsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 95 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnlEventsLayout.createSequentialGroup()96 .addContainerGap(74, Short.MAX_VALUE)97 .addComponent(scrollEvents, javax.swing.GroupLayout.PREFERRED_SIZE, 354, javax.swing.GroupLayout.PREFERRED_SIZE)98 .addGap(59, 59, 59))99 95 .addGroup(pnlEventsLayout.createSequentialGroup() 100 .addGap(112, 112, 112) 101 .addComponent(txtClockTime, javax.swing.GroupLayout.PREFERRED_SIZE, 225, javax.swing.GroupLayout.PREFERRED_SIZE) 102 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 96 .addGroup(pnlEventsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 97 .addGroup(pnlEventsLayout.createSequentialGroup() 98 .addGap(112, 112, 112) 99 .addComponent(txtClockTime, javax.swing.GroupLayout.PREFERRED_SIZE, 225, javax.swing.GroupLayout.PREFERRED_SIZE)) 100 .addGroup(pnlEventsLayout.createSequentialGroup() 101 .addContainerGap() 102 .addComponent(scrollEvents, javax.swing.GroupLayout.PREFERRED_SIZE, 430, javax.swing.GroupLayout.PREFERRED_SIZE))) 103 .addContainerGap(20, Short.MAX_VALUE)) 103 104 ); 104 105 pnlEventsLayout.setVerticalGroup( … … 120 121 }); 121 122 122 lstIncidents.setFont(new java.awt.Font("Noto Mono", 0, 15)); // NOI18N123 lstIncidents.setModel(new javax.swing.AbstractListModel<String>()124 {125 String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };126 public int getSize() { return strings.length; }127 public String getElementAt(int i) { return strings[i]; }128 });129 lstIncidents.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);130 jScrollPane1.setViewportView(lstIncidents);131 132 123 javax.swing.GroupLayout pnlIncidentsLayout = new javax.swing.GroupLayout(pnlIncidents); 133 124 pnlIncidents.setLayout(pnlIncidentsLayout); … … 135 126 pnlIncidentsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 136 127 .addGroup(pnlIncidentsLayout.createSequentialGroup() 137 .addGroup(pnlIncidentsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 138 .addComponent(btnClear) 139 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 211, javax.swing.GroupLayout.PREFERRED_SIZE)) 140 .addGap(0, 173, Short.MAX_VALUE)) 128 .addComponent(btnClear) 129 .addGap(0, 0, Short.MAX_VALUE)) 141 130 ); 142 131 pnlIncidentsLayout.setVerticalGroup( 143 132 pnlIncidentsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 144 133 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnlIncidentsLayout.createSequentialGroup() 145 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 179, javax.swing.GroupLayout.PREFERRED_SIZE) 146 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 134 .addGap(185, 185, 185) 147 135 .addComponent(btnClear) 148 136 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 149 137 ); 138 139 lstIncidents.setFont(new java.awt.Font("Noto Mono", 0, 15)); // NOI18N 140 lstIncidents.setModel(new javax.swing.AbstractListModel<String>() 141 { 142 String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" }; 143 public int getSize() { return strings.length; } 144 public String getElementAt(int i) { return strings[i]; } 145 }); 146 lstIncidents.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); 147 jScrollPane1.setViewportView(lstIncidents); 150 148 151 149 javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); … … 154 152 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 155 153 .addGroup(layout.createSequentialGroup() 156 .addComponent(pnlEvents, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 157 .addContainerGap()) 158 .addGroup(layout.createSequentialGroup() 159 .addGap(76, 76, 76) 160 .addComponent(pnlIncidents, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) 161 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 154 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) 155 .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() 156 .addContainerGap() 157 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 211, javax.swing.GroupLayout.PREFERRED_SIZE) 158 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 159 .addComponent(pnlIncidents, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 160 .addComponent(pnlEvents, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) 161 .addGap(0, 27, Short.MAX_VALUE)) 162 162 ); 163 163 layout.setVerticalGroup( … … 166 166 .addComponent(pnlEvents, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) 167 167 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 168 .addComponent(pnlIncidents, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 168 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 169 .addComponent(pnlIncidents, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 170 .addGroup(layout.createSequentialGroup() 171 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 179, javax.swing.GroupLayout.PREFERRED_SIZE) 172 .addGap(0, 0, Short.MAX_VALUE))) 169 173 .addContainerGap()) 170 174 );
Note: See TracChangeset
for help on using the changeset viewer.
