Fossil SCM

Improved rendering of the graphs on the /thisdayinhistory page. More generally, improved rendering of multiple graphs on the same page that omit the TIMELINE_DISJOINT flag.

drh 2019-05-12 23:48 trunk
Commit 8e2b8b027bc2d62a1f1ac23841be74d3e36ba6d9d6cdfbb57d97226eded8f834
Parent bcea5291cee5f9f…
3 files changed +1 -1 +1 -1 +4 -2
~ src/graph.c ~ src/graph.js ~ src/timeline.c
M src/graph.c
+1 -1
--- src/graph.c
+++ src/graph.c
@@ -589,11 +589,11 @@
589589
 iMrail = j;
590590
 break;
591591
 }
592592
 }
593593
 if( iMrail==-1 ){
594
- iMrail = findFreeRail(p, pRow->idx, p->nRow, 0);
594
+ iMrail = findFreeRail(p, pRow->idx, p->pLast->idx, 0);
595595
 if( p->mxRail>=GR_MAX_RAIL ) return;
596596
 mergeRiserFrom[iMrail] = parentRid;
597597
 }
598598
 mask = BIT(iMrail);
599599
 if( i>=pRow->nNonCherrypick ){
600600
--- src/graph.c
+++ src/graph.c
@@ -589,11 +589,11 @@
589 iMrail = j;
590 break;
591 }
592 }
593 if( iMrail==-1 ){
594 iMrail = findFreeRail(p, pRow->idx, p->nRow, 0);
595 if( p->mxRail>=GR_MAX_RAIL ) return;
596 mergeRiserFrom[iMrail] = parentRid;
597 }
598 mask = BIT(iMrail);
599 if( i>=pRow->nNonCherrypick ){
600
--- src/graph.c
+++ src/graph.c
@@ -589,11 +589,11 @@
589 iMrail = j;
590 break;
591 }
592 }
593 if( iMrail==-1 ){
594 iMrail = findFreeRail(p, pRow->idx, p->pLast->idx, 0);
595 if( p->mxRail>=GR_MAX_RAIL ) return;
596 mergeRiserFrom[iMrail] = parentRid;
597 }
598 mask = BIT(iMrail);
599 if( i>=pRow->nNonCherrypick ){
600
M src/graph.js
+1 -1
--- src/graph.js
+++ src/graph.js
@@ -348,11 +348,11 @@
348348
 for(var i=0; i<tx.rowinfo.length; i++ ){
349349
 var e = document.getElementById("m"+tx.rowinfo[i].id);
350350
 tx.rowinfo[i].y = absoluteY(e) - canvasY;
351351
 tx.rowinfo[i].x = tx.rowinfo[i].r*railPitch;
352352
 }
353
- var tlBtm = document.querySelector(".timelineBottom");
353
+ var tlBtm = document.getElementById(tx.bottomRowId);
354354
 if( tlBtm.offsetHeight<node.h ){
355355
 tlBtm.style.height = node.h + "px";
356356
 }
357357
 var btm = absoluteY(tlBtm) - canvasY + tlBtm.offsetHeight;
358358
 for( var i=0; i<tx.nrail; i++) mergeBtm[i] = btm;
359359
--- src/graph.js
+++ src/graph.js
@@ -348,11 +348,11 @@
348 for(var i=0; i<tx.rowinfo.length; i++ ){
349 var e = document.getElementById("m"+tx.rowinfo[i].id);
350 tx.rowinfo[i].y = absoluteY(e) - canvasY;
351 tx.rowinfo[i].x = tx.rowinfo[i].r*railPitch;
352 }
353 var tlBtm = document.querySelector(".timelineBottom");
354 if( tlBtm.offsetHeight<node.h ){
355 tlBtm.style.height = node.h + "px";
356 }
357 var btm = absoluteY(tlBtm) - canvasY + tlBtm.offsetHeight;
358 for( var i=0; i<tx.nrail; i++) mergeBtm[i] = btm;
359
--- src/graph.js
+++ src/graph.js
@@ -348,11 +348,11 @@
348 for(var i=0; i<tx.rowinfo.length; i++ ){
349 var e = document.getElementById("m"+tx.rowinfo[i].id);
350 tx.rowinfo[i].y = absoluteY(e) - canvasY;
351 tx.rowinfo[i].x = tx.rowinfo[i].r*railPitch;
352 }
353 var tlBtm = document.getElementById(tx.bottomRowId);
354 if( tlBtm.offsetHeight<node.h ){
355 tlBtm.style.height = node.h + "px";
356 }
357 var btm = absoluteY(tlBtm) - canvasY + tlBtm.offsetHeight;
358 for( var i=0; i<tx.nrail; i++) mergeBtm[i] = btm;
359
M src/timeline.c
+4 -2
--- src/timeline.c
+++ src/timeline.c
@@ -762,11 +762,12 @@
762762
 graph_finish(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0);
763763
 if( pGraph->nErr ){
764764
 graph_free(pGraph);
765765
 pGraph = 0;
766766
 }else{
767
- @ <tr class="timelineBottom"><td></td><td></td><td></td></tr>
767
+ @ <tr class="timelineBottom" id="btm-%d(iTableId)">\
768
+ @ <td></td><td></td><td></td></tr>
768769
 }
769770
 }
770771
 @ </table>
771772
 if( fchngQueryInit ) db_finalize(&fchngQuery);
772773
 timeline_output_graph_javascript(pGraph, tmFlags, iTableId);
@@ -848,10 +849,11 @@
848849
 @ "omitDescenders": %d(omitDescenders),
849850
 @ "fileDiff": %d(fileDiff),
850851
 @ "scrollToSelect": %d(scrollToSelect),
851852
 @ "nrail": %d(pGraph->mxRail+1),
852853
 @ "baseUrl": "%R",
854
+ @ "bottomRowId": "btm-%d(iTableId)",
853855
 if( pGraph->nRow==0 ){
854856
 @ "rowinfo": null
855857
 }else{
856858
 @ "rowinfo": [
857859
 }
@@ -2846,11 +2848,11 @@
28462848
 zId = db_text(0, "SELECT timestamp FROM timeline"
28472849
 " ORDER BY sortby DESC LIMIT 1");
28482850
 @ <h2>%d(iAgo) Year%s(iAgo>1?"s":"") Ago
28492851
 @ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
28502852
 @ </small></h2>
2851
- www_print_timeline(&q, TIMELINE_GRAPH|TIMELINE_DISJOINT, 0, 0, 0, 0);
2853
+ www_print_timeline(&q, TIMELINE_GRAPH, 0, 0, 0, 0);
28522854
 }
28532855
 db_finalize(&q);
28542856
 style_footer();
28552857
 }
28562858
28572859
--- src/timeline.c
+++ src/timeline.c
@@ -762,11 +762,12 @@
762 graph_finish(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0);
763 if( pGraph->nErr ){
764 graph_free(pGraph);
765 pGraph = 0;
766 }else{
767 @ <tr class="timelineBottom"><td></td><td></td><td></td></tr>
 
768 }
769 }
770 @ </table>
771 if( fchngQueryInit ) db_finalize(&fchngQuery);
772 timeline_output_graph_javascript(pGraph, tmFlags, iTableId);
@@ -848,10 +849,11 @@
848 @ "omitDescenders": %d(omitDescenders),
849 @ "fileDiff": %d(fileDiff),
850 @ "scrollToSelect": %d(scrollToSelect),
851 @ "nrail": %d(pGraph->mxRail+1),
852 @ "baseUrl": "%R",
 
853 if( pGraph->nRow==0 ){
854 @ "rowinfo": null
855 }else{
856 @ "rowinfo": [
857 }
@@ -2846,11 +2848,11 @@
2846 zId = db_text(0, "SELECT timestamp FROM timeline"
2847 " ORDER BY sortby DESC LIMIT 1");
2848 @ <h2>%d(iAgo) Year%s(iAgo>1?"s":"") Ago
2849 @ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
2850 @ </small></h2>
2851 www_print_timeline(&q, TIMELINE_GRAPH|TIMELINE_DISJOINT, 0, 0, 0, 0);
2852 }
2853 db_finalize(&q);
2854 style_footer();
2855 }
2856
2857
--- src/timeline.c
+++ src/timeline.c
@@ -762,11 +762,12 @@
762 graph_finish(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0);
763 if( pGraph->nErr ){
764 graph_free(pGraph);
765 pGraph = 0;
766 }else{
767 @ <tr class="timelineBottom" id="btm-%d(iTableId)">\
768 @ <td></td><td></td><td></td></tr>
769 }
770 }
771 @ </table>
772 if( fchngQueryInit ) db_finalize(&fchngQuery);
773 timeline_output_graph_javascript(pGraph, tmFlags, iTableId);
@@ -848,10 +849,11 @@
849 @ "omitDescenders": %d(omitDescenders),
850 @ "fileDiff": %d(fileDiff),
851 @ "scrollToSelect": %d(scrollToSelect),
852 @ "nrail": %d(pGraph->mxRail+1),
853 @ "baseUrl": "%R",
854 @ "bottomRowId": "btm-%d(iTableId)",
855 if( pGraph->nRow==0 ){
856 @ "rowinfo": null
857 }else{
858 @ "rowinfo": [
859 }
@@ -2846,11 +2848,11 @@
2848 zId = db_text(0, "SELECT timestamp FROM timeline"
2849 " ORDER BY sortby DESC LIMIT 1");
2850 @ <h2>%d(iAgo) Year%s(iAgo>1?"s":"") Ago
2851 @ <small>%z(href("%R/timeline?c=%t",zId))(more context)</a>\
2852 @ </small></h2>
2853 www_print_timeline(&q, TIMELINE_GRAPH, 0, 0, 0, 0);
2854 }
2855 db_finalize(&q);
2856 style_footer();
2857 }
2858
2859

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button