Fossil SCM
Fix an off-by-one error in computing some coordinates in the graph layout.
Commit
3229e5e83cd381985577b14a2eab6d2fb032085a
Parent
9ca4f330e18bb3d…
1 file changed
+3
-1
+3
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -690,11 +690,13 @@ | ||
| 690 | 690 | cgi_printf("],mi:"); |
| 691 | 691 | /* mi */ |
| 692 | 692 | cSep = '['; |
| 693 | 693 | for(i=0; i<GR_MAX_RAIL; i++){ |
| 694 | 694 | if( pRow->mergeIn[i] ){ |
| 695 | - int mi = i*pGraph->iRailPitch - mergeOffset*(2 - pRow->mergeIn[i]); | |
| 695 | + int mi = i*pGraph->iRailPitch; | |
| 696 | + if( pRow->mergeIn[i]==1 ) mi -= mergeOffset-1; | |
| 697 | + if( pRow->mergeIn[i]==3 ) mi += mergeOffset; | |
| 696 | 698 | if( pRow->mergeDown & (1<<i) ) mi = -mi; |
| 697 | 699 | cgi_printf("%c%d", cSep, mi); |
| 698 | 700 | cSep = ','; |
| 699 | 701 | } |
| 700 | 702 | } |
| 701 | 703 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -690,11 +690,13 @@ | |
| 690 | cgi_printf("],mi:"); |
| 691 | /* mi */ |
| 692 | cSep = '['; |
| 693 | for(i=0; i<GR_MAX_RAIL; i++){ |
| 694 | if( pRow->mergeIn[i] ){ |
| 695 | int mi = i*pGraph->iRailPitch - mergeOffset*(2 - pRow->mergeIn[i]); |
| 696 | if( pRow->mergeDown & (1<<i) ) mi = -mi; |
| 697 | cgi_printf("%c%d", cSep, mi); |
| 698 | cSep = ','; |
| 699 | } |
| 700 | } |
| 701 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -690,11 +690,13 @@ | |
| 690 | cgi_printf("],mi:"); |
| 691 | /* mi */ |
| 692 | cSep = '['; |
| 693 | for(i=0; i<GR_MAX_RAIL; i++){ |
| 694 | if( pRow->mergeIn[i] ){ |
| 695 | int mi = i*pGraph->iRailPitch; |
| 696 | if( pRow->mergeIn[i]==1 ) mi -= mergeOffset-1; |
| 697 | if( pRow->mergeIn[i]==3 ) mi += mergeOffset; |
| 698 | if( pRow->mergeDown & (1<<i) ) mi = -mi; |
| 699 | cgi_printf("%c%d", cSep, mi); |
| 700 | cSep = ','; |
| 701 | } |
| 702 | } |
| 703 |