Fossil SCM
Adjustments to timeline graph layout to try to improve the appearance a little.
Commit
797f1813f81871dc2393fb699cbe9d621af194cccb150179b088b4df27406df5
Parent
929f36ae3c55958…
1 file changed
+4
+4
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -980,10 +980,12 @@ | ||
| 980 | 980 | /* Priority bits: |
| 981 | 981 | ** |
| 982 | 982 | ** 0x04 The preferred branch |
| 983 | 983 | ** |
| 984 | 984 | ** 0x02 A merge rail - a rail that contains merge lines |
| 985 | + ** ^^^^----- Omit this as of 2024-04-23, as it actually seems to | |
| 986 | + ** detract from appearance, not help. | |
| 985 | 987 | ** |
| 986 | 988 | ** 0x01 A rail that merges with the preferred branch |
| 987 | 989 | */ |
| 988 | 990 | u8 aPriority[GR_MAX_RAIL]; |
| 989 | 991 | memset(aPriority, 0, p->mxRail+1); |
| @@ -1008,15 +1010,17 @@ | ||
| 1008 | 1010 | } |
| 1009 | 1011 | if( pRow->mergeOut>=0 ) aPriority[pRow->mergeOut] |= 1; |
| 1010 | 1012 | } |
| 1011 | 1013 | } |
| 1012 | 1014 | } |
| 1015 | +#if 0 /* Omit the 0x02 priority boost due to merge rails */ | |
| 1013 | 1016 | for(i=0; i<=p->mxRail; i++){ |
| 1014 | 1017 | if( p->mergeRail & BIT(i) ){ |
| 1015 | 1018 | aPriority[i] |= 2; |
| 1016 | 1019 | } |
| 1017 | 1020 | } |
| 1021 | +#endif | |
| 1018 | 1022 | |
| 1019 | 1023 | #if 0 |
| 1020 | 1024 | fprintf(stderr,"mergeRail: 0x%llx\n", p->mergeRail); |
| 1021 | 1025 | fprintf(stderr,"Priority:"); |
| 1022 | 1026 | for(i=0; i<=p->mxRail; i++) fprintf(stderr," %d", aPriority[i]); |
| 1023 | 1027 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -980,10 +980,12 @@ | |
| 980 | /* Priority bits: |
| 981 | ** |
| 982 | ** 0x04 The preferred branch |
| 983 | ** |
| 984 | ** 0x02 A merge rail - a rail that contains merge lines |
| 985 | ** |
| 986 | ** 0x01 A rail that merges with the preferred branch |
| 987 | */ |
| 988 | u8 aPriority[GR_MAX_RAIL]; |
| 989 | memset(aPriority, 0, p->mxRail+1); |
| @@ -1008,15 +1010,17 @@ | |
| 1008 | } |
| 1009 | if( pRow->mergeOut>=0 ) aPriority[pRow->mergeOut] |= 1; |
| 1010 | } |
| 1011 | } |
| 1012 | } |
| 1013 | for(i=0; i<=p->mxRail; i++){ |
| 1014 | if( p->mergeRail & BIT(i) ){ |
| 1015 | aPriority[i] |= 2; |
| 1016 | } |
| 1017 | } |
| 1018 | |
| 1019 | #if 0 |
| 1020 | fprintf(stderr,"mergeRail: 0x%llx\n", p->mergeRail); |
| 1021 | fprintf(stderr,"Priority:"); |
| 1022 | for(i=0; i<=p->mxRail; i++) fprintf(stderr," %d", aPriority[i]); |
| 1023 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -980,10 +980,12 @@ | |
| 980 | /* Priority bits: |
| 981 | ** |
| 982 | ** 0x04 The preferred branch |
| 983 | ** |
| 984 | ** 0x02 A merge rail - a rail that contains merge lines |
| 985 | ** ^^^^----- Omit this as of 2024-04-23, as it actually seems to |
| 986 | ** detract from appearance, not help. |
| 987 | ** |
| 988 | ** 0x01 A rail that merges with the preferred branch |
| 989 | */ |
| 990 | u8 aPriority[GR_MAX_RAIL]; |
| 991 | memset(aPriority, 0, p->mxRail+1); |
| @@ -1008,15 +1010,17 @@ | |
| 1010 | } |
| 1011 | if( pRow->mergeOut>=0 ) aPriority[pRow->mergeOut] |= 1; |
| 1012 | } |
| 1013 | } |
| 1014 | } |
| 1015 | #if 0 /* Omit the 0x02 priority boost due to merge rails */ |
| 1016 | for(i=0; i<=p->mxRail; i++){ |
| 1017 | if( p->mergeRail & BIT(i) ){ |
| 1018 | aPriority[i] |= 2; |
| 1019 | } |
| 1020 | } |
| 1021 | #endif |
| 1022 | |
| 1023 | #if 0 |
| 1024 | fprintf(stderr,"mergeRail: 0x%llx\n", p->mergeRail); |
| 1025 | fprintf(stderr,"Priority:"); |
| 1026 | for(i=0; i<=p->mxRail; i++) fprintf(stderr," %d", aPriority[i]); |
| 1027 |