42d91822ec103cfcc74e9f69b39d3ad8d886c278
angie
  Wed Mar 18 15:25:15 2020 -0700
Add a new trackDb setting hapClusterMethod and corresponding UI option for drawing haplotypes in VCF file order instead of clustering.  refs #25197
Applied the new setting to mm10 strainSNPs and increased its default height so that strain labels appear in the left label area.

diff --git src/hg/inc/vcfUi.h src/hg/inc/vcfUi.h
index 053de6e..58ec507 100644
--- src/hg/inc/vcfUi.h
+++ src/hg/inc/vcfUi.h
@@ -2,30 +2,34 @@
  * between more than one CGI. */
 
 /* Copyright (C) 2011 The Regents of the University of California 
  * See README in this or parent directory for licensing information. */
 #ifndef VCFUI_H
 #define VCFUI_H
 
 #include "cart.h"
 #include "trackDb.h"
 #include "vcf.h"
 
 #define VCF_HAP_HEIGHT_VAR "hapClusterHeight"
 #define VCF_DEFAULT_HAP_HEIGHT 128
 
 #define VCF_HAP_ENABLED_VAR "hapClusterEnabled"
+#define VCF_HAP_METHOD_VAR "hapClusterMethod"
+#define VCF_HAP_METHOD_CENTER_WEIGHTED "centerWeighted"
+#define VCF_HAP_METHOD_FILE_ORDER "fileOrder"
+#define VCF_DEFAULT_HAP_METHOD VCF_HAP_METHOD_CENTER_WEIGHTED
 
 #define VCF_HAP_COLORBY_VAR "hapClusterColorBy"
 #define VCF_HAP_COLORBY_ALTONLY "altOnly"
 #define VCF_HAP_COLORBY_REFALT "refAlt"
 #define VCF_HAP_COLORBY_BASE "base"
 #define VCF_DEFAULT_HAP_COLORBY VCF_HAP_COLORBY_ALTONLY
 
 #define VCF_HAP_TREEANGLE_VAR "hapClusterTreeAngle"
 #define VCF_HAP_TREEANGLE_TRIANGLE "triangle"
 #define VCF_HAP_TREEANGLE_RECTANGLE "rectangle"
 #define VCF_DEFAULT_HAP_TREEANGLE VCF_HAP_TREEANGLE_TRIANGLE
 
 #define VCF_SHOW_HW_VAR "showHardyWeinberg"
 
 #define VCF_APPLY_MIN_QUAL_VAR "applyMinQual"