taskjuggler 0.0.7 → 0.0.8

data/doc/TaskJuggler/FormatListAttribute.html

@@ -151,12 +151,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -263,7 +269,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -443,6 +449,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>
@@ -584,10 +594,10 @@
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/Attributes.rb, line 308</span>
-308:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">property</span>, <span class="ruby-identifier">type</span>)
-309:       <span class="ruby-keyword kw">super</span>
-310:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/Attributes.rb, line 309</span>
+309:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">property</span>, <span class="ruby-identifier">type</span>)
+310:       <span class="ruby-keyword kw">super</span>
+311:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -624,10 +634,10 @@
 					<div class="method-source-code"
 						id="to-s-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/Attributes.rb, line 312</span>
-312:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>(<span class="ruby-identifier">query</span> = <span class="ruby-keyword kw">nil</span>)
-313:       <span class="ruby-ivar">@value</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">', '</span>)
-314:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/Attributes.rb, line 313</span>
+313:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>(<span class="ruby-identifier">query</span> = <span class="ruby-keyword kw">nil</span>)
+314:       <span class="ruby-ivar">@value</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">', '</span>)
+315:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/TaskJuggler/GanttChart.html

@@ -73,8 +73,6 @@
 					
 					<li><a href="#method-i-addTask">#addTask</a></li>
 					
-					<li><a href="#method-i-collectAndSortArrows">#collectAndSortArrows</a></li>
-					
 					<li><a href="#method-i-completeChart">#completeChart</a></li>
 					
 					<li><a href="#method-i-dateToX">#dateToX</a></li>
@@ -83,11 +81,11 @@
 					
 					<li><a href="#method-i-generateByWidth">#generateByWidth</a></li>
 					
-					<li><a href="#method-i-generateDepArrows">#generateDepArrows</a></li>
+					<li><a href="#method-i-generateDepLines">#generateDepLines</a></li>
 					
-					<li><a href="#method-i-hasScrollbar%3F">#hasScrollbar?</a></li>
+					<li><a href="#method-i-generateTaskDepLines">#generateTaskDepLines</a></li>
 					
-					<li><a href="#method-i-routeArrow">#routeArrow</a></li>
+					<li><a href="#method-i-hasScrollbar%3F">#hasScrollbar?</a></li>
 					
 					<li><a href="#method-i-scaleByName">#scaleByName</a></li>
 					
@@ -184,12 +182,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -296,7 +300,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -476,6 +480,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>
@@ -1090,7 +1098,7 @@ Returns true if the chart includes a scrollbar.
 				<div class="method-heading">
 				
 					<span class="method-name">to_csv</span><span
-						class="method-args">()</span>
+						class="method-args">(csv, startColumn)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -1107,9 +1115,9 @@ This is a noop function.
 						id="to-csv-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/reports/GanttChart.rb, line 201</span>
-201:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_csv</span>
+201:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_csv</span>(<span class="ruby-identifier">csv</span>, <span class="ruby-identifier">startColumn</span>)
 202:       <span class="ruby-comment cmt"># Can't put a Gantt chart into a CSV file.</span>
-203:       <span class="ruby-value str">''</span>
+203:       <span class="ruby-value">0</span>
 204:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
@@ -1218,81 +1226,6 @@ Convert the chart into an HTML representation.
 			<h3 class="section-header">Private Instance Methods</h3>
 
 		
-			<div id="collect-nd-ort-rrows-method" class="method-detail ">
-				<a name="method-i-collectAndSortArrows"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">collectAndSortArrows</span><span
-						class="method-args">(kind, task, scenarioIdx, lineIndex, startX, startY)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					<p>
-Generate the dependencies on the start or end of the task depending on
-<em>kind</em>. Use &#8216;startsuccs&#8217; for the start and
-&#8216;endsuccs&#8217; for end. <em>startX</em> and <em>startY</em> are the
-graphic coordinates for the begin of the arrow line. <em>task</em>
-references the <a href="Task.html">Task</a> in question and
-<em>scenarioIdx</em> the scenario. <em>lineIndex</em> specifies the line
-number in the chart.
-</p>
-					
-
-					
-					<div class="method-source-code"
-						id="collect-nd-ort-rrows-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/reports/GanttChart.rb, line 281</span>
-281:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">collectAndSortArrows</span>(<span class="ruby-identifier">kind</span>, <span class="ruby-identifier">task</span>, <span class="ruby-identifier">scenarioIdx</span>, <span class="ruby-identifier">lineIndex</span>, <span class="ruby-identifier">startX</span>, <span class="ruby-identifier">startY</span>)
-282:       <span class="ruby-comment cmt"># We need to sort the arrows. This is an Array that holds 6 values for</span>
-283:       <span class="ruby-comment cmt"># each entry: The x and y coordinates for start and end points, the</span>
-284:       <span class="ruby-comment cmt"># sinus value of the angle between a vertical and the line specified by</span>
-285:       <span class="ruby-comment cmt"># the points and the length of the line.</span>
-286:       <span class="ruby-identifier">touples</span> = []
-287:       <span class="ruby-identifier">task</span>[<span class="ruby-identifier">kind</span>, <span class="ruby-identifier">scenarioIdx</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">t</span>, <span class="ruby-identifier">onEnd</span><span class="ruby-operator">|</span>
-288:         <span class="ruby-comment cmt"># Skip inherited dependencies and tasks that are not included in the</span>
-289:         <span class="ruby-comment cmt"># chart.</span>
-290:         <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">t</span>.<span class="ruby-identifier">parent</span> <span class="ruby-operator">&amp;&amp;</span>
-291:             <span class="ruby-identifier">task</span>.<span class="ruby-identifier">hasDependency?</span>(<span class="ruby-identifier">scenarioIdx</span>, <span class="ruby-identifier">kind</span>, <span class="ruby-identifier">t</span>.<span class="ruby-identifier">parent</span>, <span class="ruby-identifier">onEnd</span>)) <span class="ruby-operator">||</span>
-292:            <span class="ruby-operator">!</span><span class="ruby-ivar">@tasks</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">t</span>)
-293:           <span class="ruby-keyword kw">next</span>
-294:         <span class="ruby-keyword kw">end</span>
-295:         <span class="ruby-identifier">endX</span>, <span class="ruby-identifier">endY</span> = <span class="ruby-ivar">@tasks</span>[<span class="ruby-identifier">t</span>][<span class="ruby-identifier">lineIndex</span>].<span class="ruby-identifier">getTask</span>.<span class="ruby-identifier">send</span>(
-296:           <span class="ruby-identifier">onEnd</span> <span class="ruby-operator">?</span> <span class="ruby-value">:endDepLineEnd</span> <span class="ruby-operator">:</span> <span class="ruby-value">:startDepLineEnd</span>)
-297:         <span class="ruby-comment cmt"># To make sure that we minimize the crossings of arrows that</span>
-298:         <span class="ruby-comment cmt"># originate from the same position, we sort the arrows by the</span>
-299:         <span class="ruby-comment cmt"># smallest angle between the vertical line through the task end</span>
-300:         <span class="ruby-comment cmt"># and the line between the start and end of the arrow.</span>
-301:         <span class="ruby-identifier">oppLeg</span> = <span class="ruby-identifier">endX</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">startX</span>
-302:         <span class="ruby-identifier">adjLeg</span> = (<span class="ruby-identifier">startY</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">endY</span>).<span class="ruby-identifier">abs</span>
-303:         <span class="ruby-identifier">hypothenuse</span> = <span class="ruby-constant">Math</span>.<span class="ruby-identifier">sqrt</span>(<span class="ruby-identifier">adjLeg</span> <span class="ruby-operator">**</span> <span class="ruby-value">2</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">oppLeg</span> <span class="ruby-operator">**</span> <span class="ruby-value">2</span>)
-304:         <span class="ruby-comment cmt"># We can now calculate the sinus values of the angle between the</span>
-305:         <span class="ruby-comment cmt"># vertical and a line through the coordinates.</span>
-306:         <span class="ruby-identifier">touples</span> <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">startX</span>, <span class="ruby-identifier">startY</span>, <span class="ruby-identifier">endX</span>, <span class="ruby-identifier">endY</span>,
-307:                      (<span class="ruby-identifier">oppLeg</span> <span class="ruby-operator">/</span> <span class="ruby-identifier">hypothenuse</span>), <span class="ruby-identifier">hypothenuse</span> ]
-308:       <span class="ruby-keyword kw">end</span>
-309:       <span class="ruby-comment cmt"># We sort the arrows from small to a large angle. In case the angle is</span>
-310:       <span class="ruby-comment cmt"># identical, we use the length of the line as second criteria.</span>
-311:       <span class="ruby-identifier">touples</span>.<span class="ruby-identifier">sort!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">t1</span>, <span class="ruby-identifier">t2</span><span class="ruby-operator">|</span> <span class="ruby-identifier">t1</span>[<span class="ruby-value">4</span>] <span class="ruby-operator">==</span> <span class="ruby-identifier">t2</span>[<span class="ruby-value">4</span>] <span class="ruby-operator">?</span> <span class="ruby-identifier">t1</span>[<span class="ruby-value">5</span>] <span class="ruby-operator">&lt;=&gt;</span> <span class="ruby-identifier">t2</span>[<span class="ruby-value">5</span>] <span class="ruby-operator">:</span>
-312:                                                 <span class="ruby-identifier">t1</span>[<span class="ruby-value">4</span>] <span class="ruby-operator">&lt;=&gt;</span> <span class="ruby-identifier">t2</span>[<span class="ruby-value">4</span>] }
-313:       <span class="ruby-identifier">touples</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">t</span><span class="ruby-operator">|</span>
-314:         <span class="ruby-identifier">routeArrow</span>(*<span class="ruby-identifier">t</span>[<span class="ruby-value">0</span>, <span class="ruby-value">4</span>])
-315:       <span class="ruby-keyword kw">end</span>
-316:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
 			<div id="complete-hart-method" class="method-detail ">
 				<a name="method-i-completeChart"></a>
 
@@ -1321,18 +1254,32 @@ Calculate the overall height of the chart and generate dependency arrows.
 240:         <span class="ruby-ivar">@height</span> = <span class="ruby-identifier">line</span>.<span class="ruby-identifier">y</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">line</span>.<span class="ruby-identifier">height</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">line</span>.<span class="ruby-identifier">y</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">line</span>.<span class="ruby-identifier">height</span> <span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@height</span>
 241:       <span class="ruby-keyword kw">end</span>
 242: 
-243:       <span class="ruby-ivar">@router</span> = <span class="ruby-constant">GanttRouter</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@width</span>, <span class="ruby-ivar">@height</span>)
-244: 
-245:       <span class="ruby-ivar">@lines</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span>
-246:         <span class="ruby-identifier">line</span>.<span class="ruby-identifier">addBlockedZones</span>(<span class="ruby-ivar">@router</span>)
-247:       <span class="ruby-keyword kw">end</span>
-248: 
-249:       <span class="ruby-ivar">@router</span>.<span class="ruby-identifier">addZone</span>(<span class="ruby-ivar">@header</span>.<span class="ruby-identifier">nowLineX</span> <span class="ruby-operator">-</span> <span class="ruby-value">1</span>, <span class="ruby-value">0</span>, <span class="ruby-value">3</span>, <span class="ruby-ivar">@height</span> <span class="ruby-operator">-</span> <span class="ruby-value">1</span>, <span class="ruby-keyword kw">false</span>, <span class="ruby-keyword kw">true</span>)
-250: 
-251:       <span class="ruby-ivar">@tasks</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">task</span>, <span class="ruby-identifier">lines</span><span class="ruby-operator">|</span>
-252:         <span class="ruby-identifier">generateDepArrows</span>(<span class="ruby-identifier">task</span>, <span class="ruby-identifier">lines</span>)
-253:       <span class="ruby-keyword kw">end</span>
-254:     <span class="ruby-keyword kw">end</span></pre>
+243:       <span class="ruby-comment cmt"># To layout the dependency lines, we use a GanttRouter. We only provide</span>
+244:       <span class="ruby-comment cmt"># the start and end coordinates of each line and it will do the layout</span>
+245:       <span class="ruby-comment cmt"># and routing.</span>
+246:       <span class="ruby-ivar">@router</span> = <span class="ruby-constant">GanttRouter</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@width</span>, <span class="ruby-ivar">@height</span>)
+247: 
+248:       <span class="ruby-comment cmt"># We don't want horizontal lines to cross the task bars. So we block</span>
+249:       <span class="ruby-comment cmt"># these chart zones. Milestones should not be crossed in any direction.</span>
+250:       <span class="ruby-ivar">@lines</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span>
+251:         <span class="ruby-identifier">line</span>.<span class="ruby-identifier">addBlockedZones</span>(<span class="ruby-ivar">@router</span>)
+252:       <span class="ruby-keyword kw">end</span>
+253: 
+254:       <span class="ruby-comment cmt"># Also protect the current date line from other vertical lines.</span>
+255:       <span class="ruby-ivar">@router</span>.<span class="ruby-identifier">addZone</span>(<span class="ruby-ivar">@header</span>.<span class="ruby-identifier">nowLineX</span> <span class="ruby-operator">-</span> <span class="ruby-value">1</span>, <span class="ruby-value">0</span>, <span class="ruby-value">3</span>, <span class="ruby-ivar">@height</span> <span class="ruby-operator">-</span> <span class="ruby-value">1</span>, <span class="ruby-keyword kw">false</span>, <span class="ruby-keyword kw">true</span>)
+256: 
+257:       <span class="ruby-comment cmt"># Generate the dependency arrows for all visible tasks.</span>
+258:       <span class="ruby-ivar">@tasks</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">task</span>, <span class="ruby-identifier">lines</span><span class="ruby-operator">|</span>
+259:         <span class="ruby-identifier">generateDepLines</span>(<span class="ruby-identifier">task</span>, <span class="ruby-identifier">lines</span>)
+260:       <span class="ruby-keyword kw">end</span>
+261: 
+262:       <span class="ruby-comment cmt"># Make sure we have exactly one arrow head for each line end point even</span>
+263:       <span class="ruby-comment cmt"># if the point is used by multiple lines.</span>
+264:       <span class="ruby-ivar">@depArrows</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span>
+265:         <span class="ruby-identifier">endPoint</span> = <span class="ruby-identifier">line</span>.<span class="ruby-identifier">last</span>
+266:         <span class="ruby-ivar">@arrowHeads</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">endPoint</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@arrowHeads</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">endPoint</span>)
+267:       <span class="ruby-keyword kw">end</span>
+268:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1343,12 +1290,12 @@ Calculate the overall height of the chart and generate dependency arrows.
 			</div>
 
 		
-			<div id="generate-ep-rrows-method" class="method-detail ">
-				<a name="method-i-generateDepArrows"></a>
+			<div id="generate-ep-ines-method" class="method-detail ">
+				<a name="method-i-generateDepLines"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">generateDepArrows</span><span
+					<span class="method-name">generateDepLines</span><span
 						class="method-args">(task, lines)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
@@ -1366,24 +1313,24 @@ lines per task.
 
 					
 					<div class="method-source-code"
-						id="generate-ep-rrows-source">
+						id="generate-ep-ines-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/reports/GanttChart.rb, line 260</span>
-260:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateDepArrows</span>(<span class="ruby-identifier">task</span>, <span class="ruby-identifier">lines</span>)
-261:       <span class="ruby-comment cmt"># Since we need the line and the index we use an index iterator.</span>
-262:       <span class="ruby-identifier">lines</span>.<span class="ruby-identifier">length</span>.<span class="ruby-identifier">times</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">lineIndex</span><span class="ruby-operator">|</span>
-263:         <span class="ruby-identifier">line</span> = <span class="ruby-identifier">lines</span>[<span class="ruby-identifier">lineIndex</span>]
-264:         <span class="ruby-identifier">scenarioIdx</span> = <span class="ruby-identifier">line</span>.<span class="ruby-identifier">query</span>.<span class="ruby-identifier">scenarioIdx</span>
-265: 
-266:         <span class="ruby-comment cmt"># Generate the dependencies on the start of the task.</span>
-267:         <span class="ruby-identifier">collectAndSortArrows</span>(<span class="ruby-value str">'startsuccs'</span>, <span class="ruby-identifier">task</span>, <span class="ruby-identifier">scenarioIdx</span>, <span class="ruby-identifier">lineIndex</span>,
-268:                              *<span class="ruby-identifier">line</span>.<span class="ruby-identifier">getTask</span>.<span class="ruby-identifier">startDepLineStart</span>)
-269: 
-270:         <span class="ruby-comment cmt"># Generate the dependencies on the end of the task.</span>
-271:         <span class="ruby-identifier">collectAndSortArrows</span>(<span class="ruby-value str">'endsuccs'</span>, <span class="ruby-identifier">task</span>, <span class="ruby-identifier">scenarioIdx</span>, <span class="ruby-identifier">lineIndex</span>,
-272:                              *<span class="ruby-identifier">line</span>.<span class="ruby-identifier">getTask</span>.<span class="ruby-identifier">endDepLineStart</span>)
-273:       <span class="ruby-keyword kw">end</span>
-274:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/reports/GanttChart.rb, line 274</span>
+274:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateDepLines</span>(<span class="ruby-identifier">task</span>, <span class="ruby-identifier">lines</span>)
+275:       <span class="ruby-comment cmt"># Since we need the line and the index we use an index iterator.</span>
+276:       <span class="ruby-identifier">lines</span>.<span class="ruby-identifier">length</span>.<span class="ruby-identifier">times</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">lineIndex</span><span class="ruby-operator">|</span>
+277:         <span class="ruby-identifier">line</span> = <span class="ruby-identifier">lines</span>[<span class="ruby-identifier">lineIndex</span>]
+278:         <span class="ruby-identifier">scenarioIdx</span> = <span class="ruby-identifier">line</span>.<span class="ruby-identifier">query</span>.<span class="ruby-identifier">scenarioIdx</span>
+279: 
+280:         <span class="ruby-comment cmt"># Generate the dependencies on the start of the task.</span>
+281:         <span class="ruby-identifier">generateTaskDepLines</span>(<span class="ruby-value str">'startsuccs'</span>, <span class="ruby-identifier">task</span>, <span class="ruby-identifier">scenarioIdx</span>, <span class="ruby-identifier">lineIndex</span>,
+282:                              *<span class="ruby-identifier">line</span>.<span class="ruby-identifier">getTask</span>.<span class="ruby-identifier">startDepLineStart</span>)
+283: 
+284:         <span class="ruby-comment cmt"># Generate the dependencies on the end of the task.</span>
+285:         <span class="ruby-identifier">generateTaskDepLines</span>(<span class="ruby-value str">'endsuccs'</span>, <span class="ruby-identifier">task</span>, <span class="ruby-identifier">scenarioIdx</span>, <span class="ruby-identifier">lineIndex</span>,
+286:                              *<span class="ruby-identifier">line</span>.<span class="ruby-identifier">getTask</span>.<span class="ruby-identifier">endDepLineStart</span>)
+287:       <span class="ruby-keyword kw">end</span>
+288:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1394,13 +1341,13 @@ lines per task.
 			</div>
 
 		
-			<div id="route-rrow-method" class="method-detail ">
-				<a name="method-i-routeArrow"></a>
+			<div id="generate-ask-ep-ines-method" class="method-detail ">
+				<a name="method-i-generateTaskDepLines"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">routeArrow</span><span
-						class="method-args">(startX, startY, endX, endY)</span>
+					<span class="method-name">generateTaskDepLines</span><span
+						class="method-args">(kind, task, scenarioIdx, lineIndex, startX, startY)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -1408,25 +1355,39 @@ lines per task.
 				<div class="method-description">
 					
 					<p>
-Route the dependency lines from the start to the end point.
+Generate the dependencies on the start or end of the task depending on
+<em>kind</em>. Use &#8216;startsuccs&#8217; for the start and
+&#8216;endsuccs&#8217; for end. <em>startX</em> and <em>startY</em> are the
+graphic coordinates for the begin of the arrow line. <em>task</em>
+references the <a href="Task.html">Task</a> in question and
+<em>scenarioIdx</em> the scenario. <em>lineIndex</em> specifies the line
+number in the chart.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="route-rrow-source">
+						id="generate-ask-ep-ines-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/reports/GanttChart.rb, line 319</span>
-319:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">routeArrow</span>(<span class="ruby-identifier">startX</span>, <span class="ruby-identifier">startY</span>, <span class="ruby-identifier">endX</span>, <span class="ruby-identifier">endY</span>)
-320:       <span class="ruby-ivar">@depArrows</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-ivar">@router</span>.<span class="ruby-identifier">route</span>([<span class="ruby-identifier">startX</span>, <span class="ruby-identifier">startY</span>], [<span class="ruby-identifier">endX</span>, <span class="ruby-identifier">endY</span>])
-321: 
-322:       <span class="ruby-comment cmt"># It's enough to have only a single arrow drawn at the end point even if</span>
-323:       <span class="ruby-comment cmt"># it's the destination of multiple lines.</span>
-324:       <span class="ruby-ivar">@arrowHeads</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">x</span>, <span class="ruby-identifier">y</span><span class="ruby-operator">|</span>
-325:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">x</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">endX</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">y</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">endY</span>
-326:       <span class="ruby-keyword kw">end</span>
-327:       <span class="ruby-ivar">@arrowHeads</span> <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">endX</span>, <span class="ruby-identifier">endY</span> ]
-328:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/reports/GanttChart.rb, line 295</span>
+295:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateTaskDepLines</span>(<span class="ruby-identifier">kind</span>, <span class="ruby-identifier">task</span>, <span class="ruby-identifier">scenarioIdx</span>, <span class="ruby-identifier">lineIndex</span>, <span class="ruby-identifier">startX</span>, <span class="ruby-identifier">startY</span>)
+296:       <span class="ruby-comment cmt"># This is an Array that holds 4 values for</span>
+297:       <span class="ruby-comment cmt"># each entry: The x and y coordinates for start and end points.</span>
+298:       <span class="ruby-identifier">touples</span> = []
+299:       <span class="ruby-identifier">task</span>[<span class="ruby-identifier">kind</span>, <span class="ruby-identifier">scenarioIdx</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">t</span>, <span class="ruby-identifier">onEnd</span><span class="ruby-operator">|</span>
+300:         <span class="ruby-comment cmt"># Skip inherited dependencies and tasks that are not included in the</span>
+301:         <span class="ruby-comment cmt"># chart.</span>
+302:         <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">t</span>.<span class="ruby-identifier">parent</span> <span class="ruby-operator">&amp;&amp;</span>
+303:             <span class="ruby-identifier">task</span>.<span class="ruby-identifier">hasDependency?</span>(<span class="ruby-identifier">scenarioIdx</span>, <span class="ruby-identifier">kind</span>, <span class="ruby-identifier">t</span>.<span class="ruby-identifier">parent</span>, <span class="ruby-identifier">onEnd</span>)) <span class="ruby-operator">||</span>
+304:            <span class="ruby-operator">!</span><span class="ruby-ivar">@tasks</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">t</span>)
+305:           <span class="ruby-keyword kw">next</span>
+306:         <span class="ruby-keyword kw">end</span>
+307:         <span class="ruby-identifier">endX</span>, <span class="ruby-identifier">endY</span> = <span class="ruby-ivar">@tasks</span>[<span class="ruby-identifier">t</span>][<span class="ruby-identifier">lineIndex</span>].<span class="ruby-identifier">getTask</span>.<span class="ruby-identifier">send</span>(
+308:           <span class="ruby-identifier">onEnd</span> <span class="ruby-operator">?</span> <span class="ruby-value">:endDepLineEnd</span> <span class="ruby-operator">:</span> <span class="ruby-value">:startDepLineEnd</span>)
+309:         <span class="ruby-identifier">touples</span> <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">startX</span>, <span class="ruby-identifier">startY</span>, <span class="ruby-identifier">endX</span>, <span class="ruby-identifier">endY</span> ]
+310:       <span class="ruby-keyword kw">end</span>
+311:       <span class="ruby-ivar">@depArrows</span> <span class="ruby-operator">+=</span> <span class="ruby-ivar">@router</span>.<span class="ruby-identifier">routeLines</span>(<span class="ruby-identifier">touples</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">touples</span>.<span class="ruby-identifier">empty?</span>()
+312:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/TaskJuggler/GanttContainer.html

@@ -172,12 +172,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -284,7 +290,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -464,6 +470,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>

data/doc/TaskJuggler/GanttHeader.html

@@ -155,12 +155,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -267,7 +273,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -447,6 +453,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>