Skip to content

Commit

Permalink
extract DEFAULT_COLOR to constant to avoid import error
Browse files Browse the repository at this point in the history
  • Loading branch information
sgratzl committed Dec 24, 2018
1 parent 098347c commit 109e852
Show file tree
Hide file tree
Showing 24 changed files with 60 additions and 56 deletions.
4 changes: 2 additions & 2 deletions src/model/BooleansColumn.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ArrayColumn, {IArrayColumnDesc} from './ArrayColumn';
import {ISetColumn, ICategoricalColorMappingFunction} from './ICategoricalColumn';
import {IDataRow} from './interfaces';
import {IDataRow, DEFAULT_COLOR} from './interfaces';
import CategoricalColumn from './CategoricalColumn';
import {DEFAULT_COLOR_FUNCTION, restoreColorMapping} from './CategoricalColorMappingFunction';
import ValueColumn, {dataLoaded} from './ValueColumn';
Expand Down Expand Up @@ -64,7 +64,7 @@ export default class BooleansColumn extends ArrayColumn<boolean> implements ISet
}

getColors(row: IDataRow) {
return this.getCategories(row).map((d) => d ? this.colorMapping.apply(d) : Column.DEFAULT_COLOR);
return this.getCategories(row).map((d) => d ? this.colorMapping.apply(d) : DEFAULT_COLOR);
}


Expand Down
5 changes: 3 additions & 2 deletions src/model/CategoricalColorMappingFunction.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import {Column, ICategory, ICategoricalColorMappingFunction} from '.';
import {ICategory, ICategoricalColorMappingFunction} from '.';
import {DEFAULT_COLOR} from './interfaces';

/**
* @internal
*/
export const DEFAULT_COLOR_FUNCTION: ICategoricalColorMappingFunction = {
apply: (v) => v ? v.color : Column.DEFAULT_COLOR,
apply: (v) => v ? v.color : DEFAULT_COLOR,
dump: () => null,
clone: () => DEFAULT_COLOR_FUNCTION,
eq: (other) => other === DEFAULT_COLOR_FUNCTION
Expand Down
4 changes: 2 additions & 2 deletions src/model/CategoricalColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Category, toolbar} from './annotations';
import {DEFAULT_COLOR_FUNCTION, restoreColorMapping} from './CategoricalColorMappingFunction';
import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
import {ICategoricalColumn, ICategoricalColumnDesc, ICategoricalFilter, ICategory, ICategoricalColorMappingFunction} from './ICategoricalColumn';
import {IDataRow, IGroup, ICompareValue} from './interfaces';
import {IDataRow, IGroup, ICompareValue, DEFAULT_COLOR} from './interfaces';
import {missingGroup} from './missing';
import ValueColumn, {dataLoaded} from './ValueColumn';
import {toCategories, isCategoryIncluded, isEqualCategoricalFilter, toCompareCategoryValue, COMPARE_CATEGORY_VALUE_TYPES, toGroupCompareCategoryValue, COMPARE_GROUP_CATEGORY_VALUE_TYPES} from './internalCategorical';
Expand Down Expand Up @@ -160,7 +160,7 @@ export default class CategoricalColumn extends ValueColumn<string> implements IC

getColor(row: IDataRow) {
const v = this.getCategory(row);
return v ? this.colorMapping.apply(v) : Column.DEFAULT_COLOR;
return v ? this.colorMapping.apply(v) : DEFAULT_COLOR;
}

getColorMapping() {
Expand Down
4 changes: 2 additions & 2 deletions src/model/CategoricalMapColumn.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ICategoricalDesc, ICategory, ICategoricalLikeColumn, ICategoricalColorMappingFunction} from './ICategoricalColumn';
import {IDataRow} from './interfaces';
import {IDataRow, DEFAULT_COLOR} from './interfaces';
import MapColumn, {IMapColumnDesc} from './MapColumn';
import {DEFAULT_COLOR_FUNCTION, restoreColorMapping} from './CategoricalColorMappingFunction';
import CategoricalColumn from './CategoricalColumn';
Expand Down Expand Up @@ -74,7 +74,7 @@ export default class CategoricalMapColumn extends MapColumn<string | null> imple
}

getColors(row: IDataRow) {
return this.getCategories(row).map(({key, value}) => ({key, value: value ? this.colorMapping.apply(value) : Column.DEFAULT_COLOR}));
return this.getCategories(row).map(({key, value}) => ({key, value: value ? this.colorMapping.apply(value) : DEFAULT_COLOR}));
}

getValue(row: IDataRow) {
Expand Down
4 changes: 2 additions & 2 deletions src/model/CategoricalsColumn.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ArrayColumn, {IArrayColumnDesc} from './ArrayColumn';
import {ICategoricalDesc, ICategory, ICategoricalLikeColumn, ICategoricalColorMappingFunction} from './ICategoricalColumn';
import {IDataRow} from './interfaces';
import {IDataRow, DEFAULT_COLOR} from './interfaces';
import {toolbar} from './annotations';
import CategoricalColumn from './CategoricalColumn';
import {DEFAULT_COLOR_FUNCTION, restoreColorMapping} from './CategoricalColorMappingFunction';
Expand Down Expand Up @@ -71,7 +71,7 @@ export default class CategoricalsColumn extends ArrayColumn<string | null> imple
}

getColors(row: IDataRow) {
return this.getCategories(row).map((d) => d ? this.colorMapping.apply(d) : Column.DEFAULT_COLOR);
return this.getCategories(row).map((d) => d ? this.colorMapping.apply(d) : DEFAULT_COLOR);
}

getSet(row: IDataRow) {
Expand Down
5 changes: 3 additions & 2 deletions src/model/ColorMappingFunction.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {interpolateBlues, interpolateGreens, interpolateGreys, interpolateOranges, interpolatePurples, interpolateReds, interpolateCool, interpolateCubehelixDefault, interpolateWarm, interpolatePlasma, interpolateMagma, interpolateViridis, interpolateInferno, interpolateYlOrRd, interpolateYlOrBr, interpolateBuGn, interpolateBuPu, interpolateGnBu, interpolateOrRd, interpolatePuBuGn, interpolatePuBu, interpolatePuRd, interpolateRdPu, interpolateYlGnBu, interpolateYlGn, interpolateRainbow, interpolateBrBG, interpolatePRGn, interpolatePiYG, interpolatePuOr, interpolateRdBu, interpolateRdGy, interpolateRdYlBu, interpolateRdYlGn, interpolateSpectral} from 'd3-scale-chromatic';
import {equal} from '../internal';
import {scaleLinear} from 'd3-scale';
import {Column, IInterpolateColorMappingFunction, IColorMappingFunction, ISolidColorMappingFunction, IQuantizedColorMappingFunction, ICustomColorMappingFunction, IMapAbleDesc} from '.';
import {IInterpolateColorMappingFunction, IColorMappingFunction, ISolidColorMappingFunction, IQuantizedColorMappingFunction, ICustomColorMappingFunction, IMapAbleDesc} from '.';
import {DEFAULT_COLOR} from './interfaces';

/** @internal */
export class InterpolatingColorFunction implements IInterpolateColorMappingFunction {
Expand Down Expand Up @@ -147,7 +148,7 @@ export function asColorFunction(color: string) {
/**
* @internal
*/
export const DEFAULT_COLOR_FUNCTION = asColorFunction(Column.DEFAULT_COLOR);
export const DEFAULT_COLOR_FUNCTION = asColorFunction(DEFAULT_COLOR);

/**
* @internal
Expand Down
9 changes: 2 additions & 7 deletions src/model/Column.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {AEventDispatcher, ISequence, similar, fixCSS, IEventListener} from '../internal';
import {isSortingAscByDefault} from './annotations';
import {IColumnDump, ISortCriteria, defaultGroup, ECompareValueType, IColumnDesc, IDataRow, IGroup, IColumnParent, IColumnMetaData, IFlatColumn, ICompareValue} from './interfaces';
import {IColumnDump, ISortCriteria, defaultGroup, ECompareValueType, IColumnDesc, IDataRow, IGroup, IColumnParent, IColumnMetaData, IFlatColumn, ICompareValue, DEFAULT_COLOR} from './interfaces';
import Ranking from './Ranking';

/**
Expand Down Expand Up @@ -85,11 +85,6 @@ export declare function visibilityChanged(previous: boolean, current: boolean):
* a column in LineUp
*/
export default class Column extends AEventDispatcher {
/**
* default color that should be used
* @type {string}
*/
static readonly DEFAULT_COLOR = '#C1C1C1';
/**
* magic variable for showing all columns
* @type {number}
Expand Down Expand Up @@ -488,7 +483,7 @@ export default class Column extends AEventDispatcher {
}

getColor(_row: IDataRow) {
return Column.DEFAULT_COLOR;
return DEFAULT_COLOR;
}

toCompareValue(_row: IDataRow, _valueCache?: any): ICompareValue | ICompareValue[] {
Expand Down
4 changes: 2 additions & 2 deletions src/model/DateColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {ISequence, equal, IEventListener} from '../internal';
import {Category, dialogAddons, toolbar} from './annotations';
import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
import {IDateColumn, IDateDesc, IDateFilter, IDateGrouper} from './IDateColumn';
import {defaultGroup, IDataRow, IGroup, ECompareValueType, IValueColumnDesc} from './interfaces';
import {defaultGroup, IDataRow, IGroup, ECompareValueType, IValueColumnDesc, DEFAULT_COLOR} from './interfaces';
import {isMissingValue, isUnknown, missingGroup} from './missing';
import ValueColumn, {dataLoaded} from './ValueColumn';
import {noDateFilter, defaultDateGrouper, isDummyDateFilter, isDefaultDateGrouper, restoreDateFilter, isEqualDateFilter, isDateIncluded, toDateGroup, chooseAggregatedDate} from './internalDate';
Expand Down Expand Up @@ -183,7 +183,7 @@ export default class DateColumn extends ValueColumn<Date> implements IDateColumn
const g = toDateGroup(this.currentGrouper, v);
return {
name: g.name,
color: Column.DEFAULT_COLOR
color: DEFAULT_COLOR
};
}

Expand Down
6 changes: 3 additions & 3 deletions src/model/HierarchyColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {Category, toolbar} from './annotations';
import CategoricalColumn from './CategoricalColumn';
import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, dirtyCaches, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged} from './Column';
import {ICategoricalColumn, ICategory, ICategoricalColorMappingFunction} from './ICategoricalColumn';
import {IDataRow, IGroup, IValueColumnDesc} from './interfaces';
import {IDataRow, IGroup, IValueColumnDesc, DEFAULT_COLOR} from './interfaces';
import {colorPool} from './internal';
import {missingGroup} from './missing';
import ValueColumn, {dataLoaded} from './ValueColumn';
Expand Down Expand Up @@ -350,14 +350,14 @@ export function deriveHierarchy(categories: (Partial<ICategory> & {parent: strin
children: [],
label: c.name!,
name: c.name!,
color: Column.DEFAULT_COLOR,
color: DEFAULT_COLOR,
value: 0
}, lookup.get(c.name!) || {}, c);
lookup.set(c.name!, item);

if (!lookup.has(p)) {
// create proxy
lookup.set(p, {name: p, children: [], label: p, value: 0, color: Column.DEFAULT_COLOR});
lookup.set(p, {name: p, children: [], label: p, value: 0, color: DEFAULT_COLOR});
}
lookup.get(p)!.children.push(item);
});
Expand Down
4 changes: 2 additions & 2 deletions src/model/ImpositionBoxPlotColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {toolbar, SortByDefault, dialogAddons} from './annotations';
import BoxPlotColumn from './BoxPlotColumn';
import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
import CompositeColumn, {addColumn, filterChanged, moveColumn, removeColumn} from './CompositeColumn';
import {IDataRow, IGroup, IColumnDesc} from './interfaces';
import {IDataRow, IGroup, IColumnDesc, DEFAULT_COLOR} from './interfaces';
import {ESortMethod, IBoxPlotColumn, INumberFilter, isBoxPlotColumn, IMappingFunction, IColorMappingFunction, isMapAbleColumn} from './INumberColumn';
import {ScaleMappingFunction} from './MappingFunction';
import NumbersColumn from './NumbersColumn';
Expand Down Expand Up @@ -85,7 +85,7 @@ export default class ImpositionBoxPlotColumn extends CompositeColumn implements
const c = this._children;
switch (c.length) {
case 0:
return Column.DEFAULT_COLOR;
return DEFAULT_COLOR;
case 1:
return c[0].getColor(row);
default:
Expand Down
4 changes: 2 additions & 2 deletions src/model/ImpositionCompositeColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {suffix, IEventListener, ISequence} from '../internal';
import {toolbar, SortByDefault} from './annotations';
import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
import CompositeColumn, {addColumn, filterChanged, moveColumn, removeColumn} from './CompositeColumn';
import {IDataRow, IGroup, IColumnDesc} from './interfaces';
import {IDataRow, IGroup, IColumnDesc, DEFAULT_COLOR} from './interfaces';
import {isNumberColumn, INumberColumn, isMapAbleColumn, IColorMappingFunction, IMappingFunction} from './INumberColumn';
import NumberColumn from './NumberColumn';
import {DEFAULT_FORMATTER} from './internalNumber';
Expand Down Expand Up @@ -105,7 +105,7 @@ export default class ImpositionCompositeColumn extends CompositeColumn implement
const c = this._children;
switch (c.length) {
case 0:
return Column.DEFAULT_COLOR;
return DEFAULT_COLOR;
case 1:
return c[0].getColor(row);
default:
Expand Down
4 changes: 2 additions & 2 deletions src/model/ImpositionCompositesColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {toolbar, dialogAddons, SortByDefault} from './annotations';
import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
import CompositeColumn, {addColumn, filterChanged, moveColumn, removeColumn} from './CompositeColumn';
import {IKeyValue} from './IArrayColumn';
import {IDataRow, IGroup, IColumnDesc} from './interfaces';
import {IDataRow, IGroup, IColumnDesc, DEFAULT_COLOR} from './interfaces';
import {EAdvancedSortMethod, INumberFilter, INumbersColumn, isNumbersColumn, IMappingFunction, IColorMappingFunction, isMapAbleColumn} from './INumberColumn';
import {ScaleMappingFunction} from './MappingFunction';
import NumbersColumn from './NumbersColumn';
Expand Down Expand Up @@ -83,7 +83,7 @@ export default class ImpositionCompositesColumn extends CompositeColumn implemen
const c = this._children;
switch (c.length) {
case 0:
return Column.DEFAULT_COLOR;
return DEFAULT_COLOR;
case 1:
return c[0].getColor(row);
default:
Expand Down
4 changes: 2 additions & 2 deletions src/model/NumberColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {equalArrays, IEventListener, ISequence} from '../internal';
import {Category, dialogAddons, SortByDefault, toolbar} from './annotations';
import {createColorMappingFunction, restoreColorMapping} from './ColorMappingFunction';
import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
import {IDataRow, IGroup, ECompareValueType, IValueColumnDesc} from './interfaces';
import {IDataRow, IGroup, ECompareValueType, IValueColumnDesc, DEFAULT_COLOR} from './interfaces';
import {INumberColumn, EAdvancedSortMethod, INumberDesc, INumberFilter, IMappingFunction, IColorMappingFunction, IMapAbleColumn} from './INumberColumn';
import {createMappingFunction, restoreMapping, ScaleMappingFunction} from './MappingFunction';
import {isMissingValue, isUnknown, missingGroup} from './missing';
Expand Down Expand Up @@ -255,7 +255,7 @@ export default class NumberColumn extends ValueColumn<number> implements INumber
getColor(row: IDataRow) {
const v = this.getNumber(row);
if (isNaN(v)) {
return Column.DEFAULT_COLOR;
return DEFAULT_COLOR;
}
return this.colorMapping.apply(v);
}
Expand Down
6 changes: 3 additions & 3 deletions src/model/ReduceColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {toolbar} from './annotations';
import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
import CompositeColumn, {addColumn, filterChanged, moveColumn, removeColumn} from './CompositeColumn';
import CompositeNumberColumn, {ICompositeNumberColumnDesc} from './CompositeNumberColumn';
import {IDataRow} from './interfaces';
import {IDataRow, DEFAULT_COLOR} from './interfaces';
import {EAdvancedSortMethod} from './INumberColumn';

/**
Expand Down Expand Up @@ -58,11 +58,11 @@ export default class ReduceColumn extends CompositeNumberColumn {
//compute the index of the maximal one
const c = this._children;
if (c.length === 0 || this.reduce === EAdvancedSortMethod.q1 || this.reduce === EAdvancedSortMethod.q3 || this.reduce === EAdvancedSortMethod.mean) {
return Column.DEFAULT_COLOR;
return DEFAULT_COLOR;
}
const v = this.compute(row);
const selected = c.find((c) => c.getValue(row) === v);
return selected ? selected.getColor(row) : Column.DEFAULT_COLOR;
return selected ? selected.getColor(row) : DEFAULT_COLOR;
}

protected compute(row: IDataRow) {
Expand Down
6 changes: 6 additions & 0 deletions src/model/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ export interface IStyleColumn {
visible: boolean;
}

/**
* default color that should be used
* @type {string}
*/
export const DEFAULT_COLOR = '#C1C1C1';


export interface IColumnDesc extends Partial<IStyleColumn> {
/**
Expand Down
5 changes: 3 additions & 2 deletions src/model/internalCategorical.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import {ISequence, isSeqEmpty} from '../internal';
import {FIRST_IS_MISSING, IDataRow, Column, ECompareValueType, ICompareValue, ICategory, ICategoricalColumn, ICategoricalDesc, ICategoricalFilter} from '.';
import {FIRST_IS_MISSING, IDataRow, ECompareValueType, ICompareValue, ICategory, ICategoricalColumn, ICategoricalDesc, ICategoricalFilter} from '.';
import {colorPool} from './internal';
import {DEFAULT_COLOR} from './interfaces';

/** @internal */
export function toCategory(cat: (string | Partial<ICategory>), value: number, nextColor: () => string = () => Column.DEFAULT_COLOR) {
export function toCategory(cat: (string | Partial<ICategory>), value: number, nextColor: () => string = () => DEFAULT_COLOR) {
if (typeof cat === 'string') {
//just the category value
return {name: cat, label: cat, color: nextColor(), value};
Expand Down
4 changes: 2 additions & 2 deletions src/provider/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Ranking, isNumberColumn, Column, IColumnDesc, isSupportType, isMapAbleColumn} from '../model';
import {Ranking, isNumberColumn, Column, IColumnDesc, isSupportType, isMapAbleColumn, DEFAULT_COLOR} from '../model';
import {colorPool, MAX_COLORS} from '../model/internal';
import {concat, equal, extent, range} from '../internal';
import {timeParse} from 'd3-time-format';
Expand Down Expand Up @@ -279,7 +279,7 @@ export function deriveColors(columns: IColumnDesc[]) {
const colors = colorPool();
columns.forEach((col: IColumnDesc) => {
if (isMapAbleColumn(col)) {
col.colorMapping = col.colorMapping || col.color || colors() || Column.DEFAULT_COLOR;
col.colorMapping = col.colorMapping || col.color || colors() || DEFAULT_COLOR;
}
});
return columns;
Expand Down
8 changes: 4 additions & 4 deletions src/renderer/BarCellRenderer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {round} from '../internal';
import {Column, isNumbersColumn, IDataRow, INumberColumn, isNumberColumn} from '../model';
import {Column, isNumbersColumn, IDataRow, INumberColumn, isNumberColumn, DEFAULT_COLOR} from '../model';
import {setText, adaptDynamicColorToBgColor, noRenderer} from './utils';
import {CANVAS_HEIGHT, cssClass} from '../styles';
import {colorOf} from './impose';
Expand Down Expand Up @@ -27,7 +27,7 @@ export default class BarCellRenderer implements ICellRendererFactory {
const width = context.colWidth(col);
return {
template: `<div title="">
<div class="${cssClass('bar-label')}" style='background-color: ${Column.DEFAULT_COLOR}'>
<div class="${cssClass('bar-label')}" style='background-color: ${DEFAULT_COLOR}'>
<span ${this.renderValue ? '' : `class="${cssClass('hover-only')}"`}></span>
</div>
</div>`,
Expand All @@ -45,14 +45,14 @@ export default class BarCellRenderer implements ICellRendererFactory {
setText(bar.firstElementChild!, title);
const item = <HTMLElement>bar.firstElementChild!;
setText(item, title);
adaptDynamicColorToBgColor(item, color || Column.DEFAULT_COLOR, title, w / 100);
adaptDynamicColorToBgColor(item, color || DEFAULT_COLOR, title, w / 100);
},
render: (ctx: CanvasRenderingContext2D, d: IDataRow) => {
if (renderMissingCanvas(ctx, col, d, width)) {
return;
}
const value = col.getNumber(d);
ctx.fillStyle = colorOf(col, d, imposer, value) || Column.DEFAULT_COLOR;
ctx.fillStyle = colorOf(col, d, imposer, value) || DEFAULT_COLOR;
const w = width * value;
ctx.fillRect(0, 0, isNaN(w) ? 0 : w, CANVAS_HEIGHT);

Expand Down
Loading

0 comments on commit 109e852

Please sign in to comment.