fix default config errors

lineupjs · Mar 17, 2020 · 5396584 · 5396584
1 parent 9700562
commit 5396584
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 32 deletions.
diff --git a/src/model/ImpositionBoxPlotColumn.ts b/src/model/ImpositionBoxPlotColumn.ts
@@ -47,11 +47,11 @@ export default class ImpositionBoxPlotColumn extends CompositeColumn implements
   static readonly EVENT_COLOR_MAPPING_CHANGED = NumbersColumn.EVENT_COLOR_MAPPING_CHANGED;
 
   constructor(id: string, desc: Readonly<IColumnDesc>) {
-    super(id, desc);
-
-    this.setDefaultRenderer('boxplot');
-    this.setDefaultGroupRenderer('boxplot');
-    this.setDefaultSummaryRenderer('boxplot');
+    super(id, desc, {
+      renderer: 'boxplot',
+      groupRenderer: 'boxplot',
+      summaryRenderer: 'boxplot'
+    });
   }
 
   get label() {

diff --git a/src/model/ImpositionCompositeColumn.ts b/src/model/ImpositionCompositeColumn.ts
@@ -43,11 +43,11 @@ export default class ImpositionCompositeColumn extends CompositeColumn implement
   static readonly EVENT_COLOR_MAPPING_CHANGED = NumberColumn.EVENT_COLOR_MAPPING_CHANGED;
 
   constructor(id: string, desc: Readonly<IColumnDesc>) {
-    super(id, desc);
-
-    this.setDefaultRenderer('number');
-    this.setDefaultGroupRenderer('boxplot');
-    this.setDefaultSummaryRenderer('histogram');
+    super(id, desc, {
+      renderer: 'number',
+      groupRenderer: 'boxplot',
+      summaryRenderer: 'histogram'
+    });
   }
 
   get label() {

diff --git a/src/model/ImpositionCompositesColumn.ts b/src/model/ImpositionCompositesColumn.ts
@@ -45,11 +45,11 @@ export default class ImpositionCompositesColumn extends CompositeColumn implemen
   static readonly EVENT_COLOR_MAPPING_CHANGED = NumbersColumn.EVENT_COLOR_MAPPING_CHANGED;
 
   constructor(id: string, desc: Readonly<IColumnDesc>) {
-    super(id, desc);
-
-    this.setDefaultRenderer('numbers');
-    this.setDefaultGroupRenderer('numbers');
-    this.setDefaultSummaryRenderer('histogram');
+    super(id, desc, {
+      renderer: 'numbers',
+      groupRenderer: 'numbers',
+      summaryRenderer: 'histogram'
+    });
   }
 
   get label() {

diff --git a/src/model/LinkColumn.ts b/src/model/LinkColumn.ts
@@ -73,18 +73,17 @@ export default class LinkColumn extends ValueColumn<string | ILink> {
   readonly escape: boolean;
 
   constructor(id: string, desc: Readonly<ILinkColumnDesc>) {
-    super(id, desc);
-    this.setDefaultWidth(200); //by default 200
+    super(id, desc, Object.assign({
+      width: 200
+    }, desc.pattern ? {
+        renderer: 'link',
+        groupRenderer: 'link'
+      } : {}));
     this.alignment = <any>desc.alignment || EAlignment.left;
     this.escape = desc.escape !== false;
 
     this.pattern = desc.pattern || '';
     this.patternTemplates = desc.patternTemplates || [];
-
-    if (this.pattern) {
-      this.setDefaultRenderer('link');
-      this.setDefaultGroupRenderer('link');
-    }
   }
 
   setPattern(pattern: string) {

diff --git a/src/model/LinkMapColumn.ts b/src/model/LinkMapColumn.ts
@@ -33,13 +33,14 @@ export default class LinkMapColumn extends MapColumn<string> {
   readonly patternTemplates: string[];
 
   constructor(id: string, desc: Readonly<ILinkMapColumnDesc>) {
-    super(id, desc);
-    this.setDefaultWidth(200); //by default 200
+    super(id, desc, {
+      width: 200,
+      renderer: 'map'
+    });
     this.alignment = <any>desc.alignment || EAlignment.left;
     this.escape = desc.escape !== false;
     this.pattern = desc.pattern || '';
     this.patternTemplates = desc.patternTemplates || [];
-    this.setDefaultRenderer('map');
   }
 
   setPattern(pattern: string) {

diff --git a/src/model/LinksColumn.ts b/src/model/LinksColumn.ts
@@ -28,8 +28,9 @@ export default class LinksColumn extends ArrayColumn<string | ILink> {
   readonly patternTemplates: string[];
 
   constructor(id: string, desc: Readonly<ILinksColumnDesc>) {
-    super(id, desc);
-    this.setDefaultWidth(200); //by default 200
+    super(id, desc, {
+      width: 200
+    });
     this.alignment = <any>desc.alignment || EAlignment.left;
     this.escape = desc.escape !== false;
     this.pattern = desc.pattern || '';

diff --git a/src/model/ScriptColumn.ts b/src/model/ScriptColumn.ts
@@ -283,15 +283,15 @@ export default class ScriptColumn extends CompositeNumberColumn implements IMapA
 
 
   constructor(id: string, desc: Readonly<IScriptColumnDesc>, factory: ITypeFactory) {
-    super(id, desc);
+    super(id, desc, {
+      renderer: 'number',
+      groupRenderer: 'boxplot',
+      summaryRenderer: 'histogram'
+    });
     this.script = desc.script || this.script;
     this.mapping = restoreMapping(desc, factory);
     this.original = this.mapping.clone();
     this.colorMapping = factory.colorMappingFunction(desc.colorMapping || desc.color);
-
-    this.setDefaultRenderer('number');
-    this.setDefaultGroupRenderer('boxplot');
-    this.setDefaultSummaryRenderer('histogram');
   }
 
   protected createEventList() {