|
@@ -66,9 +66,11 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
66
|
66
|
\def\RTDefLineWidth{1pt}
|
67
|
67
|
\def\RTDefLineStyle{solid}
|
68
|
68
|
\def\RTDefExecHeight{1}
|
69
|
|
-\def\RTArrowStyle{stealth} %arrow style for deadlines, arrivals and horizontal axes
|
|
69
|
+\def\RTArrowStyle{stealth}
|
|
70
|
+%arrow style for deadlines, arrivals and horizontal axes
|
70
|
71
|
% -{Triangle 45}[length=x] with length is a more modern arrow style but requires arrows.meta tikz library (available on latest texlive but rarely up to date on linux distribution)
|
71
|
72
|
%-stealth is a predefined more classical arrow style
|
|
73
|
+\def\RTDefEndInstance{0}
|
72
|
74
|
|
73
|
75
|
\def\RTExecLabel{\ }
|
74
|
76
|
\def\RTTaskSymbol{\RTDefTaskSymbol}
|
|
@@ -85,9 +87,7 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
85
|
87
|
\def\RTLineWidth{\RTDefLineWidth}
|
86
|
88
|
\def\RTLineStyle{\RTDefLineStyle}
|
87
|
89
|
\def\RTExecHeight{\RTDefExecHeight}
|
88
|
|
-
|
89
|
|
-
|
90
|
|
-
|
|
90
|
+\def\RTEndInstance{\RTDefEndInstance}
|
91
|
91
|
|
92
|
92
|
\define@key{RT}{height}[\RTNullWindowHeight]{\def\RTWindowHeight{#1}}
|
93
|
93
|
\define@key{RT}{width}[10]{\def\RTWindowLength{#1}}
|
|
@@ -109,6 +109,7 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
109
|
109
|
\define@key{RT}{lw}[\RTDefLineWidth]{\def\RTLineWidth{#1}}
|
110
|
110
|
\define@key{RT}{style}[\RTDefLineStyle]{\def\RTLineStyle{#1}}
|
111
|
111
|
\define@key{RT}{exeheight}[\RTDefExecHeight]{\def\RTExecHeight{#1}}
|
|
112
|
+\define@key{RT}{end}[\RTDefEndInstance]{\def\RTEndInstance{#1}}
|
112
|
113
|
|
113
|
114
|
|
114
|
115
|
%%
|
|
@@ -121,6 +122,7 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
121
|
122
|
\newdimen\yy % y position
|
122
|
123
|
\newdimen\xxx % x position
|
123
|
124
|
\newdimen\yyy % y position
|
|
125
|
+\newdimen\xtmp % x position
|
124
|
126
|
\newcount\nsx % number of horizontal slots
|
125
|
127
|
\newcount\nsy % number of vertical slots
|
126
|
128
|
\newcount\nhl % number of horizontal lines
|
|
@@ -213,12 +215,14 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
213
|
215
|
\setkeys{RT}{linecolor}%
|
214
|
216
|
\setkeys{RT}{xscale}%
|
215
|
217
|
\setkeys{RT}{nosymbols}%
|
|
218
|
+ \setkeys{RT}{end}%
|
216
|
219
|
}
|
217
|
220
|
|
218
|
221
|
\def\@RTExecDefaultValues{
|
219
|
222
|
\setkeys{RT}{color}%
|
220
|
223
|
\setkeys{RT}{execlabel}%
|
221
|
224
|
\setkeys{RT}{linecolor}%
|
|
225
|
+ \setkeys{RT}{end}%
|
222
|
226
|
}
|
223
|
227
|
|
224
|
228
|
\def\RTGridEnd{
|
|
@@ -365,7 +369,7 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
365
|
369
|
\@compute@xx{#3}
|
366
|
370
|
\yyy = \yy \advance \yyy by 2\sy
|
367
|
371
|
\begin{pgfonlayer}{foreground}
|
368
|
|
- \draw [\RTLineColor, thick, \RTArrowStyle-] (\xx,\yy) -- (\xx,\yyy);
|
|
372
|
+ \draw [\RTLineStyle, \RTLineColor, thick, \RTArrowStyle-] (\xx,\yy) -- (\xx,\yyy);
|
369
|
373
|
\end{pgfonlayer}
|
370
|
374
|
\@RTExecDefaultValues
|
371
|
375
|
}
|
|
@@ -399,6 +403,14 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
399
|
403
|
\advance \xx by \xxx \xx = .5\xx
|
400
|
404
|
\advance \yy by .5\RTExecHeight\sy
|
401
|
405
|
\draw (\xx,\yy) node[font=\rtfont] {\RTNumberLabelSize \RTExecLabel};%\RTNumberLabelSize
|
|
406
|
+ \if\RTEndInstance\RTDefEndInstance
|
|
407
|
+ \relax
|
|
408
|
+ \else
|
|
409
|
+ \begin{pgfonlayer}{foreground}
|
|
410
|
+ \draw[\RTLineColor, fill] (\xxx,\yyy) circle (1.5pt);
|
|
411
|
+ \end{pgfonlayer}
|
|
412
|
+ \fi
|
|
413
|
+
|
402
|
414
|
\@RTExecDefaultValues
|
403
|
415
|
}
|
404
|
416
|
%
|
|
@@ -526,16 +538,17 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
526
|
538
|
}
|
527
|
539
|
|
528
|
540
|
% TaskEnd
|
529
|
|
-% Task end: draws a circle when the job terminates
|
|
541
|
+% Task end: draws a circle, typically to indicate job termination
|
|
542
|
+% (see also the end key in \TaskExecDelta and \TaskExecution)
|
530
|
543
|
% par 1: task number from 1 to n
|
531
|
544
|
% par 2: slot number from 0 to l-1
|
532
|
545
|
\newcommand{\TaskEnd}[3][nocommand=1]{%
|
533
|
546
|
\setkeys{RT}{#1}%
|
534
|
547
|
\@compute@yy{#2}
|
535
|
548
|
\@compute@xx{#3}
|
536
|
|
- \yyy = \yy \advance \yyy by 2\sy%
|
|
549
|
+ \yyy = \yy \advance \yyy by \sy%
|
537
|
550
|
\begin{pgfonlayer}{foreground}
|
538
|
|
- \draw[fill] (\xx,\yy) circle (1.5pt);
|
|
551
|
+ \draw[\RTLineColor, fill=\RTTaskColor] (\xx,\yyy) circle (1.5pt);
|
539
|
552
|
\end{pgfonlayer}
|
540
|
553
|
\@RTExecDefaultValues%
|
541
|
554
|
}
|
|
@@ -603,6 +616,13 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
603
|
616
|
\draw [fill=\RTTaskColor,\RTTaskFill,draw=\RTLineColor, thick] (\xx,\yy) rectangle (\xxx,\yyy);
|
604
|
617
|
\advance \xx by \xxx \xx = .5\xx
|
605
|
618
|
\draw (\xx,\yy) node[above, font=\rtfont] {\RTTaskLabelSize \RTExecLabel}; %\RTNumberLabelSize
|
|
619
|
+ \if\RTEndInstance\RTDefEndInstance
|
|
620
|
+ \relax
|
|
621
|
+ \else
|
|
622
|
+ \begin{pgfonlayer}{foreground}
|
|
623
|
+ \draw[\RTLineColor, fill] (\xxx,\yyy) circle (1.5pt);
|
|
624
|
+ \end{pgfonlayer}
|
|
625
|
+ \fi
|
606
|
626
|
\@RTExecDefaultValues
|
607
|
627
|
}
|
608
|
628
|
|
|
@@ -622,7 +642,6 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
622
|
642
|
}
|
623
|
643
|
|
624
|
644
|
|
625
|
|
-
|
626
|
645
|
%
|
627
|
646
|
% TaskRespTime
|
628
|
647
|
% par 1: task
|
|
@@ -664,6 +683,9 @@ Please update pgf to version 2.10 minimum!\MessageBreak
|
664
|
683
|
\renewcommand<>{\TaskExecDelta}[4][nocommand=1]{
|
665
|
684
|
\only#5{\beameroriginal{\TaskExecDelta}[#1]{#2}{#3}{#4}}
|
666
|
685
|
}
|
|
686
|
+ \renewcommand<>{\TaskExecDeltaEnd}[4][nocommand=1]{
|
|
687
|
+ \only#5{\beameroriginal{\TaskExecDeltaEnd}[#1]{#2}{#3}{#4}}
|
|
688
|
+ }
|
667
|
689
|
\renewcommand<>{\TaskNExecDelta}[6][nocommand=1]{
|
668
|
690
|
\only#7{\beameroriginal{\TaskNExecDelta}[#1]{#2}{#3}{#4}{#5}{#6}}
|
669
|
691
|
}
|