switch default numbering of columns to base 26, excel style

Author: paulfitz

coopy/CellBuilder.hx

@@ -109,8 +109,10 @@ interface CellBuilder {
      *
      * @param unit the desired relationship, in terms of a local row/column number, a remote row/column number and when present a parent row/column number
      *
+     * @param row_like true if working with rows, false if working with columns
+     *
      * @return a cell representing the numeric relationship between a row/column
      *
      */
-    function links(unit: Unit) : Dynamic;
+    function links(unit: Unit, row_like: Bool) : Dynamic;
 }

coopy/CompareFlags.hx

@@ -173,6 +173,15 @@ class CompareFlags {
      */
     public var parent : Table;
 
+    /**
+     *
+     * Should column numbers, if present, be rendered spreadsheet-style
+     * as A,B,C,...,AA,BB,CC?
+     * Defaults to true.
+     *
+     */
+    public var count_like_a_spreadsheet : Bool;
+
     public function new() {
         ordered = true;
         show_unchanged = false;
@@ -192,6 +201,7 @@ class CompareFlags {
         show_unchanged_meta = false;
         tables = null;
         parent = null;
+        count_like_a_spreadsheet = true;
     }
 
     /**

coopy/FlatCellBuilder.hx

@@ -9,8 +9,10 @@ class FlatCellBuilder implements CellBuilder {
     private var view : View;
     private var separator : String;
     private var conflict_separator : String;
+    private var flags : CompareFlags;
 
-    public function new() {
+    public function new(flags: CompareFlags) {
+        this.flags = flags;
     }
 
     public function needSeparator() {
@@ -46,7 +48,10 @@ class FlatCellBuilder implements CellBuilder {
         return view.toDatum(label);
     }
 
-    public function links(unit: Unit) : Dynamic {
+    public function links(unit: Unit, row_like: Bool) : Dynamic {
+        if (flags.count_like_a_spreadsheet && !row_like) {
+            return view.toDatum(unit.toBase26String());
+        }
         return view.toDatum(unit.toString());
     }
 

coopy/NestedCellBuilder.hx

@@ -50,7 +50,7 @@ class NestedCellBuilder implements CellBuilder {
         return x;
     }
 
-    public function links(unit: Unit) : Dynamic {
+    public function links(unit: Unit, row_like: Bool) : Dynamic {
         var h = view.makeHash();
         if (unit.p>=-1) {
             view.hashSet(h,"before",negToNull(unit.p));

coopy/TableDiff.hx

@@ -451,7 +451,7 @@ class TableDiff {
                     output.setCell(0,i,"");
                     continue;
                 }
-                output.setCell(0,i,builder.links(unit));
+                output.setCell(0,i,builder.links(unit,true));
             }
             target = new Array<Int>();
             for (i in 0...output.height) {
@@ -464,7 +464,7 @@ class TableDiff {
                     output.setCell(i,0,"");
                     continue;
                 }
-                output.setCell(i,0,builder.links(unit));
+                output.setCell(i,0,builder.links(unit,false));
             }
             output.setCell(0,0,builder.marker("@:@"));
         }
@@ -808,7 +808,7 @@ class TableDiff {
             if (flags.allow_nested_cells) {
                 builder = new NestedCellBuilder();
             } else {
-                builder = new FlatCellBuilder();
+                builder = new FlatCellBuilder(flags);
             }
         }
         output.resize(0,0);

coopy/Unit.hx

@@ -100,4 +100,27 @@ class Unit {
         }
         return false;
     }
+
+    private function base26(num: Int) : String {
+        // thanks @jordigh
+        var alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        if (num<0) return "-";
+        var out = "";
+        do {
+            out = out + alpha.charAt(num % 26);
+            num = Math.floor(num / 26) - 1;
+        } while (num>=0);
+        return out;
+    }
+
+    /**
+     *
+     * @return as for toString(), but representing row/column numbers
+     * as A,B,C,D,...,AA,AB,AC,AD,....
+     *
+     */
+    public function toBase26String() : String {
+        if (p>=-1) return base26(p) + "|" + base26(l) + ":" + base26(r);
+        return base26(l) + ":" + base26(r);
+    }
 }

test/data/bridges_diff_add_column.html

@@ -1,6 +1,6 @@
 <table>
 <thead>
-<tr class="index"><td class="index">@:@</td><td></td><td>0:0</td><td>1:1</td><td>-:2</td></tr>
+<tr class="index"><td class="index">@:@</td><td></td><td>A:A</td><td>B:B</td><td>-:C</td></tr>
 <tr class="spec"><td class="index"></td><td>!</td><td></td><td></td><td class="add">+++</td></tr>
 <tr class="header"><th class="index"></th><th>@@</th><th>bridge</th><th>designer</th><th class="add">length</th></tr>
 </thead>

test/data/bridges_diff_add_column_ncol.html

@@ -0,0 +1,18 @@
+<table>
+<thead>
+<tr class="index"><td class="index">@:@</td><td></td><td>0:0</td><td>1:1</td><td>-:2</td></tr>
+<tr class="spec"><td class="index"></td><td>!</td><td></td><td></td><td class="add">+++</td></tr>
+<tr class="header"><th class="index"></th><th>@@</th><th>bridge</th><th>designer</th><th class="add">length</th></tr>
+</thead>
+<tbody>
+<tr><td class="index">1:1</td><td>+</td><td>Brooklyn</td><td>J. A. Roebling</td><td class="add">1595</td></tr>
+<tr class="add"><td class="index">-:2</td><td>+++</td><td>Manhattan</td><td>G. Lindenthal</td><td class="add">1470</td></tr>
+<tr class="modify"><td class="index">2:3</td><td class="modify">→</td><td>Williamsburg</td><td class="modify">D. Duck→L. L. Buck</td><td class="add">1600</td></tr>
+<tr><td class="index">3:4</td><td>+</td><td>Queensborough</td><td>Palmer & Hornbostel</td><td class="add">1182</td></tr>
+<tr><td class="index">4:5</td><td>+</td><td>Triborough</td><td>O. H. Ammann</td><td class="add">1380,383</td></tr>
+<tr><td class="index">5:6</td><td>+</td><td>Bronx Whitestone</td><td>O. H. Ammann</td><td class="add">2300</td></tr>
+<tr><td class="index">6:7</td><td>+</td><td>Throgs Neck</td><td>O. H. Ammann</td><td class="add">1800</td></tr>
+<tr><td class="index">7:8</td><td>+</td><td>George Washington</td><td>O. H. Ammann</td><td class="add">3500</td></tr>
+<tr class="remove"><td class="index">8:-</td><td>---</td><td>Spamspan</td><td>S. Spamington</td><td class="add">null</td></tr>
+</tbody>
+</table>

test/data/bridges_diff_show_index.html

@@ -1,6 +1,6 @@
 <table>
 <thead>
-<tr class="index"><td class="index">@:@</td><td></td><td>0:0</td><td>1:1</td><td>2:2</td></tr>
+<tr class="index"><td class="index">@:@</td><td></td><td>A:A</td><td>B:B</td><td>C:C</td></tr>
 <tr class="header"><th class="index"></th><th>@@</th><th>bridge</th><th>designer</th><th>length</th></tr>
 </thead>
 <tbody>

test/data/bridges_diff_show_index_ncol.html

@@ -0,0 +1,15 @@
+<table>
+<thead>
+<tr class="index"><td class="index">@:@</td><td></td><td>0:0</td><td>1:1</td><td>2:2</td></tr>
+<tr class="header"><th class="index"></th><th>@@</th><th>bridge</th><th>designer</th><th>length</th></tr>
+</thead>
+<tbody>
+<tr><td class="index">1:1</td><td></td><td>Brooklyn</td><td>J. A. Roebling</td><td>1595</td></tr>
+<tr class="add"><td class="index">-:2</td><td>+++</td><td>Manhattan</td><td>G. Lindenthal</td><td>1470</td></tr>
+<tr class="modify"><td class="index">2:3</td><td class="modify">→</td><td>Williamsburg</td><td class="modify">D. Duck→L. L. Buck</td><td>1600</td></tr>
+<tr><td class="index">3:4</td><td></td><td>Queensborough</td><td>Palmer & Hornbostel</td><td>1182</td></tr>
+<tr class="gap"><td class="index"></td><td>...</td><td>...</td><td>...</td><td>...</td></tr>
+<tr><td class="index">7:8</td><td></td><td>George Washington</td><td>O. H. Ammann</td><td>3500</td></tr>
+<tr class="remove"><td class="index">8:-</td><td>---</td><td>Spamspan</td><td>S. Spamington</td><td>10000</td></tr>
+</tbody>
+</table>

test/test_hilite_render.js

@@ -31,9 +31,15 @@ options.always_show_order = true;
 options.never_show_order = false;
 checkMatch("data/bridges_diff_show_index.html",align,options);
 
+options.count_like_a_spreadsheet = false;
+checkMatch("data/bridges_diff_show_index_ncol.html",align,options);
+options.count_like_a_spreadsheet = true;
+
 var broken_bridges_without_length = broken_bridges.clone();
 new coopy.TableModifier(broken_bridges_without_length).removeColumn(2);
 ct = new coopy.compareTables(broken_bridges_without_length,bridges);
 align = ct.align();
 checkMatch("data/bridges_diff_add_column.html",align,options);
 
+options.count_like_a_spreadsheet = false;
+checkMatch("data/bridges_diff_add_column_ncol.html",align,options);