Merge branch 'ravel-525-rename-rho-to-correlation' into ravel-548-pha…

…ntom-pasted-items
highperformancecoder · May 7, 2024 · 73a088c · 73a088c
2 parents a8289f2 + 9695394
commit 73a088c
Show file tree

Hide file tree

Showing 9 changed files with 318 additions and 276 deletions.
diff --git a/gui-tk/icons/rho.gif → gui-tk/icons/correlation.gif b/gui-tk/icons/rho.gif → gui-tk/icons/correlation.gif
diff --git a/model/sheet.cc b/model/sheet.cc
@@ -235,18 +235,18 @@ namespace
         default: // just to shut up the "maybe uninitialised" checker.
         case ShowSlice::head:
           tailStartRow=startRow=0;
-          numRows=height/rowHeight+1;
+          numRows=std::min(size, size_t(height/rowHeight+1));
           break;
         case ShowSlice::headAndTail:
           startRow=0;
-          numRows=0.5*height/rowHeight-1;
+          numRows=std::min(size, size_t(0.5*height/rowHeight-1));
           tailStartRow=size-numRows;
-          if (2*numRows*rowHeight>height)
+          if (numRows<size && 2*numRows*rowHeight>height)
             tailStartRow++;
           break;
         case ShowSlice::tail:
-          numRows=height/rowHeight-1;
-          tailStartRow=startRow=size>numRows? size-numRows: 0;
+          numRows=std::min(size, size_t(height/rowHeight-1));
+          tailStartRow=startRow=size-numRows;
           break;
         }
     }
@@ -256,7 +256,7 @@ namespace
           row=tailStartRow; // for middle elision
           y+=rowHeight;
         }
-      return row>tailStartRow+numRows;
+      return row>=tailStartRow+numRows;
     }
   };
 }

diff --git a/test/00/allItemsRenderCheck.sh b/test/00/allItemsRenderCheck.sh
@@ -46,17 +46,31 @@ minsky.canvas.renderToSVG('allItemsOnBorder.svg')
 
 for i in range(len(minsky.model.items)):
   if minsky.model.items[i].classType() =="Sheet":
-    minsky.model.items[i].showSlice("headAndTail")
+    minsky.model.items[i].showRowSlice("headAndTail")
     minsky.model.items[i].updateBoundingBox()
 
 minsky.canvas.renderToSVG('allItemsHeadAndTail.svg')
 
 for i in range(len(minsky.model.items)):
   if minsky.model.items[i].classType()=="Sheet":
-    minsky.model.items[i].showSlice("tail")           
+    minsky.model.items[i].showRowSlice("tail")           
     minsky.model.items[i].updateBoundingBox()
 
 minsky.canvas.renderToSVG('allItemsTail.svg')
+
+for i in range(len(minsky.model.items)):
+  if minsky.model.items[i].classType() =="Sheet":
+    minsky.model.items[i].showColSlice("headAndTail")
+    minsky.model.items[i].updateBoundingBox()
+
+minsky.canvas.renderToSVG('allItemsColHeadAndTail.svg')
+
+for i in range(len(minsky.model.items)):
+  if minsky.model.items[i].classType()=="Sheet":
+    minsky.model.items[i].showColSlice("tail")           
+    minsky.model.items[i].updateBoundingBox()
+
+minsky.canvas.renderToSVG('allItemsColTail.svg')
 EOF
 
 python3 input.py

diff --git a/test/renderedImages/allItemsBare.svg b/test/renderedImages/allItemsBare.svg