Procházet zdrojové kódy

Minor graphical bug fixes (arrow style, label positions)

abertout před 9 roky
rodič
revize
d4dca890d5
1 změnil soubory, kde provedl 15 přidání a 16 odebrání
  1. 15
    16
      rtsched.sty

+ 15
- 16
rtsched.sty Zobrazit soubor

@@ -51,7 +51,7 @@
51 51
 \def\RTDefLineWidth{1pt}
52 52
 \def\RTDefLineStyle{solid}
53 53
 \def\RTDefExecHeight{1}
54
-\def\RTArrowStyle{-stealth} %arrow style for deadlines, arrivals and horizontal axes
54
+\def\RTArrowStyle{stealth} %arrow style for deadlines, arrivals and horizontal axes
55 55
 % -{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)
56 56
 %-stealth is a predefined more classical arrow style
57 57
 
@@ -184,7 +184,7 @@
184 184
     \if\RTAxisInvisible\RTDefAxisInvisible
185 185
       \begin{pgfonlayer}{foreground} 
186 186
       \foreach \i [evaluate = \i as \j using (\hy -3*\i*\sy)] in {0,...,\ntaskslessone}{
187
-      \draw [very thick,\RTArrowStyle] (\sx,\j-3*\sy) -- (\RTWindowLength - \sx,\j-3*\sy);
187
+      \draw [very thick,-\RTArrowStyle] (\sx,\j-3*\sy) -- (\RTWindowLength - \sx,\j-3*\sy);
188 188
       }
189 189
       \end{pgfonlayer} 
190 190
     \fi 
@@ -251,8 +251,7 @@
251 251
     \@compute@yy{#2}
252 252
     \@compute@xx{0}
253 253
     \xxx = \RTWindowLength \advance \xxx by -\sx 
254
-    \draw [\RTLineColor,\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
255
-    \psline[linecolor=\RTLineColor]{->}(\xx,\yy)(\xxx,\yy)%
254
+    \draw [\RTLineColor,-\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
256 255
     \@RTExecDefaultValues%
257 256
 }
258 257
 
@@ -261,10 +260,10 @@
261 260
     \@compute@yy{#2}
262 261
     \@compute@xx{0}
263 262
     \xxx = \RTWindowLength \advance \xxx by -\sx 
264
-    \draw [\RTLineColor,\RTArrowStyle] (\xx,\yy) -- (\xxx,\yy);
263
+    \draw [\RTLineColor,-\RTArrowStyle] (\xx,\yy) -- (\xxx,\yy);
265 264
     \yyy = 3\sy \multiply \yyy by #3 \advance \yyy by \yy
266 265
     \advance \yyy by -\sy
267
-    \draw [\RTLineColor,\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
266
+    \draw [\RTLineColor,-\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
268 267
     \@RTExecDefaultValues%
269 268
 }
270 269
 
@@ -287,7 +286,7 @@
287 286
     \@compute@xx{#3}
288 287
     \yyy = \yy \advance \yyy by 2\sy%
289 288
      \begin{pgfonlayer}{foreground} 
290
-    \draw [\RTLineColor, thick,\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
289
+    \draw [\RTLineColor, thick,-\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
291 290
      \end{pgfonlayer}
292 291
 
293 292
     \@RTExecDefaultValues%
@@ -303,11 +302,11 @@
303 302
   \@compute@xx{#3}
304 303
   \yyy = \yy \advance \yyy by 2\sy
305 304
   \begin{pgfonlayer}{foreground} 
306
-  \draw [\RTLineColor, thick,\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
305
+  \draw [\RTLineColor, thick,-\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
307 306
   \end{pgfonlayer}
308 307
   \advance \xx by #4\sx
309 308
   \begin{pgfonlayer}{foreground} 
310
-  \draw [\RTLineColor, thick,\RTArrowStyle] (\xx,\yyy) -- (\xx,\yy);
309
+  \draw [\RTLineColor, thick, -\RTArrowStyle] (\xx,\yyy) -- (\xx,\yy);
311 310
   \end{pgfonlayer}
312 311
   \@RTExecDefaultValues
313 312
 }
@@ -322,7 +321,7 @@
322 321
   \@compute@xx{#3}
323 322
   \yyy = \yy \advance \yyy by 2\sy
324 323
   \begin{pgfonlayer}{foreground} 
325
-  \draw [\RTLineColor, thick,<-] (\xx,\yy) -- (\xx,\yyy);
324
+  \draw [\RTLineColor, thick, \RTArrowStyle-] (\xx,\yy) -- (\xx,\yyy);
326 325
   \end{pgfonlayer}
327 326
   \@RTExecDefaultValues
328 327
 }
@@ -333,9 +332,10 @@
333 332
   \@compute@xx{#3}
334 333
   \yyy = \yy \advance \yyy by \RTExecHeight\sy
335 334
   \@compute@xxx{#4}
336
- \draw [fill=\RTTaskColor,\RTTaskFill,draw=\RTLineColor, thick] (\xx,\yy) rectangle (\xxx,\yyy);
335
+  \draw [fill=\RTTaskColor,\RTTaskFill,draw=\RTLineColor, thick] (\xx,\yy) rectangle (\xxx,\yyy);
337 336
   \advance \xx by \xxx \xx = .5\xx
338
- \draw (\xx,\yy) node[above, font=\rtfont] {\RTNumberLabelSize \RTExecLabel};%\RTNumberLabelSize
337
+  \advance \yy by .5\RTExecHeight\sy
338
+  \draw (\xx,\yy) node[font=\rtfont] {\RTNumberLabelSize \RTExecLabel};%\RTNumberLabelSize
339 339
   \@RTExecDefaultValues
340 340
 }
341 341
 %
@@ -396,7 +396,7 @@
396 396
   \yyy = -3\sy \multiply \yyy by #3 \advance \yyy by \sy
397 397
   \advance \yyy by \hy \advance \yyy by -\sy % \RTWindowHeight
398 398
   \begin{pgfonlayer}{foreground} 
399
-  \draw [dashed, thick,\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
399
+  \draw [dashed, thick,-\RTArrowStyle] (\xx,\yy) -- (\xx,\yyy);
400 400
   \end{pgfonlayer}
401 401
   \@RTExecDefaultValues
402 402
 }
@@ -416,7 +416,7 @@
416 416
   \advance \yyy by \hy %\advance \yyy by -\sy %\RTWindowHeight
417 417
   \xxx = #5\sx \advance \xxx by \sx
418 418
    \begin{pgfonlayer}{foreground} 
419
-  \draw [dashed, thick,\RTArrowStyle] (\xx,\yy) -- (\xxx,\yyy);
419
+  \draw [dashed, thick,-\RTArrowStyle] (\xx,\yy) -- (\xxx,\yyy);
420 420
    \end{pgfonlayer}
421 421
 
422 422
 }
@@ -465,7 +465,7 @@
465 465
 \newcommand{\RowLabel}[3][nocommand=1]{
466 466
   \setkeys{RT}{#1}%
467 467
   \@compute@yy{#2}
468
-  \advance \yy by 1.5\sy
468
+  \advance \yy by 2\sy
469 469
   \xx = \RTRowLabelOffset %\advance \xx by \sx
470 470
   \node[below left,font=\rtfont] at (-\xx , \yy) {\RTTaskLabelSize #3};%\RTTaskLabelSize
471 471
 }
@@ -506,7 +506,6 @@
506 506
   \@RTExecDefaultValues
507 507
 }
508 508
 
509
-
510 509
 \@ifclassloaded{beamer}{
511 510
   \renewcommand<>{\TaskArrival}[3][nocommand=1]{
512 511
     \only#4{\beameroriginal{\TaskArrival}[#1]{#2}{#3}}

Loading…
Zrušit
Uložit