Fossil SCM
Tweaks to the graph layout. Add a graph to ticket timelines.
Commit
cf178577ec43ed804a906ef5b0f0ec3dcbc71bdc
Parent
b408ece7f603de5…
2 files changed
+2
-2
+1
-1
+2
-2
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -299,11 +299,11 @@ | ||
| 299 | 299 | } |
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | /* Find the pChild pointer for each node. |
| 303 | 303 | ** |
| 304 | - ** The pChild points to node directly above on the same rail. | |
| 304 | + ** The pChild points to the node directly above on the same rail. | |
| 305 | 305 | ** The pChild must be in the same branch. Leaf nodes have a NULL |
| 306 | 306 | ** pChild. |
| 307 | 307 | ** |
| 308 | 308 | ** In the case of a fork, choose the pChild that results in the |
| 309 | 309 | ** longest rail. |
| @@ -380,11 +380,11 @@ | ||
| 380 | 380 | } |
| 381 | 381 | pRow->iRail = findFreeRail(p, 0, pParent->idx, inUse, pParent->iRail); |
| 382 | 382 | pParent->aiRaiser[pRow->iRail] = pRow->idx; |
| 383 | 383 | } |
| 384 | 384 | mask = 1<<pRow->iRail; |
| 385 | - if( pRow->pPrev ) pRow->pPrev->railInUse |= mask; | |
| 385 | +/* if( pRow->pPrev ) pRow->pPrev->railInUse |= mask; */ | |
| 386 | 386 | if( pRow->pNext ) pRow->pNext->railInUse |= mask; |
| 387 | 387 | if( pRow->pChild==0 ){ |
| 388 | 388 | inUse &= ~mask; |
| 389 | 389 | }else{ |
| 390 | 390 | inUse |= mask; |
| 391 | 391 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -299,11 +299,11 @@ | |
| 299 | } |
| 300 | } |
| 301 | |
| 302 | /* Find the pChild pointer for each node. |
| 303 | ** |
| 304 | ** The pChild points to node directly above on the same rail. |
| 305 | ** The pChild must be in the same branch. Leaf nodes have a NULL |
| 306 | ** pChild. |
| 307 | ** |
| 308 | ** In the case of a fork, choose the pChild that results in the |
| 309 | ** longest rail. |
| @@ -380,11 +380,11 @@ | |
| 380 | } |
| 381 | pRow->iRail = findFreeRail(p, 0, pParent->idx, inUse, pParent->iRail); |
| 382 | pParent->aiRaiser[pRow->iRail] = pRow->idx; |
| 383 | } |
| 384 | mask = 1<<pRow->iRail; |
| 385 | if( pRow->pPrev ) pRow->pPrev->railInUse |= mask; |
| 386 | if( pRow->pNext ) pRow->pNext->railInUse |= mask; |
| 387 | if( pRow->pChild==0 ){ |
| 388 | inUse &= ~mask; |
| 389 | }else{ |
| 390 | inUse |= mask; |
| 391 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -299,11 +299,11 @@ | |
| 299 | } |
| 300 | } |
| 301 | |
| 302 | /* Find the pChild pointer for each node. |
| 303 | ** |
| 304 | ** The pChild points to the node directly above on the same rail. |
| 305 | ** The pChild must be in the same branch. Leaf nodes have a NULL |
| 306 | ** pChild. |
| 307 | ** |
| 308 | ** In the case of a fork, choose the pChild that results in the |
| 309 | ** longest rail. |
| @@ -380,11 +380,11 @@ | |
| 380 | } |
| 381 | pRow->iRail = findFreeRail(p, 0, pParent->idx, inUse, pParent->iRail); |
| 382 | pParent->aiRaiser[pRow->iRail] = pRow->idx; |
| 383 | } |
| 384 | mask = 1<<pRow->iRail; |
| 385 | /* if( pRow->pPrev ) pRow->pPrev->railInUse |= mask; */ |
| 386 | if( pRow->pNext ) pRow->pNext->railInUse |= mask; |
| 387 | if( pRow->pChild==0 ){ |
| 388 | inUse &= ~mask; |
| 389 | }else{ |
| 390 | inUse |= mask; |
| 391 |
+1
-1
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -703,11 +703,11 @@ | ||
| 703 | 703 | timeline_query_for_www(), tagid, zFullUuid, zFullUuid, zFullUuid |
| 704 | 704 | ); |
| 705 | 705 | } |
| 706 | 706 | db_prepare(&q, zSQL); |
| 707 | 707 | free(zSQL); |
| 708 | - www_print_timeline(&q, TIMELINE_ARTID, 0); | |
| 708 | + www_print_timeline(&q, TIMELINE_ARTID|TIMELINE_DISJOINT|TIMELINE_GRAPH, 0); | |
| 709 | 709 | db_finalize(&q); |
| 710 | 710 | style_footer(); |
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | /* |
| 714 | 714 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -703,11 +703,11 @@ | |
| 703 | timeline_query_for_www(), tagid, zFullUuid, zFullUuid, zFullUuid |
| 704 | ); |
| 705 | } |
| 706 | db_prepare(&q, zSQL); |
| 707 | free(zSQL); |
| 708 | www_print_timeline(&q, TIMELINE_ARTID, 0); |
| 709 | db_finalize(&q); |
| 710 | style_footer(); |
| 711 | } |
| 712 | |
| 713 | /* |
| 714 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -703,11 +703,11 @@ | |
| 703 | timeline_query_for_www(), tagid, zFullUuid, zFullUuid, zFullUuid |
| 704 | ); |
| 705 | } |
| 706 | db_prepare(&q, zSQL); |
| 707 | free(zSQL); |
| 708 | www_print_timeline(&q, TIMELINE_ARTID|TIMELINE_DISJOINT|TIMELINE_GRAPH, 0); |
| 709 | db_finalize(&q); |
| 710 | style_footer(); |
| 711 | } |
| 712 | |
| 713 | /* |
| 714 |