fix imports

lineupjs · Mar 15, 2019 · a7282cf · a7282cf
1 parent 3b1c5c0
commit a7282cf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/src/model/BoxPlotColumn.ts b/src/model/BoxPlotColumn.ts
@@ -1,11 +1,10 @@
 import {format} from 'd3-format';
 import {IBoxPlotData, IEventListener} from '../internal';
 import {Category, dialogAddons, SortByDefault, toolbar} from './annotations';
-import {createColorMappingFunction} from './ColorMappingFunction';
 import Column, {dirty, dirtyCaches, dirtyHeader, dirtyValues, groupRendererChanged, labelChanged, metaDataChanged, rendererTypeChanged, summaryRendererChanged, visibilityChanged, widthChanged} from './Column';
 import {IDataRow, ECompareValueType, IValueColumnDesc, ITypeFactory} from './interfaces';
 import {ESortMethod, IBoxPlotColumn, INumberDesc, INumberFilter, IColorMappingFunction, IMappingFunction} from './INumberColumn';
-import {createMappingFunction, restoreMapping, ScaleMappingFunction} from './MappingFunction';
+import {restoreMapping} from './MappingFunction';
 import NumberColumn from './NumberColumn';
 import ValueColumn, {dataLoaded} from './ValueColumn';
 import {DEFAULT_FORMATTER, noNumberFilter, toCompareBoxPlotValue, getBoxPlotNumber, isDummyNumberFilter, restoreNumberFilter} from './internalNumber';
@@ -205,13 +204,11 @@ export default class BoxPlotColumn extends ValueColumn<IBoxPlotData> implements
     if (dump.filter) {
       this.currentFilter = restoreNumberFilter(dump.filter);
     }
-    if (dump.map) {
-      this.mapping = createMappingFunction(dump.map);
-    } else if (dump.domain) {
-      this.mapping = new ScaleMappingFunction(dump.domain, 'linear', dump.range || [0, 1]);
+    if (dump.map || dump.domain) {
+      this.mapping = restoreMapping(dump, factory);
     }
     if (dump.colorMapping) {
-      this.colorMapping = createColorMappingFunction(dump.colorMapping);
+      this.colorMapping = factory.colorMappingFunction(dump.colorMapping);
     }
   }
 

diff --git a/src/model/ColorMappingFunction.ts b/src/model/ColorMappingFunction.ts
@@ -232,7 +232,7 @@ export function colorMappingFunctions() {
   return types;
 }
 
-const DEFAULT_COLOR_FUNCTION = new SolidColorFunction(DEFAULT_COLOR);
+export const DEFAULT_COLOR_FUNCTION = new SolidColorFunction(DEFAULT_COLOR);
 
 
 /**

diff --git a/src/model/index.ts b/src/model/index.ts
@@ -12,7 +12,7 @@ export * from './IArrayColumn';
 
 export {ScaleMappingFunction, ScriptMappingFunction} from './MappingFunction';
 export {DEFAULT_CATEGORICAL_COLOR_FUNCTION, ReplacmentColorMappingFunction} from './CategoricalColorMappingFunction';
-export {CustomColorMappingFunction, DEFAULT_COLOR_FUNCTION, InterpolatingColorFunction, QuantizedColorFunction, SolidColorFunction} from './ColorMappingFunction';
+export {CustomColorMappingFunction, DEFAULT_COLOR_FUNCTION, SequentialColorFunction, DivergentColorFunction, UnknownColorFunction, QuantizedColorFunction, SolidColorFunction} from './ColorMappingFunction';
 
 export {default as ActionColumn} from './ActionColumn';
 export * from './ActionColumn';

diff --git a/src/model/interfaces.ts b/src/model/interfaces.ts
@@ -3,6 +3,7 @@ import Ranking from './Ranking';
 import CompositeColumn from './CompositeColumn';
 import {IColorMappingFunction, IMappingFunction} from './INumberColumn';
 import {ICategoricalColorMappingFunction, ICategory} from './ICategoricalColumn';
+import {IScriptMappingFunctionType} from './MappingFunction';
 
 export interface IStyleColumn {
   /**
@@ -255,7 +256,7 @@ export interface ITypeFactory {
   (dump: IColumnDump): Column;
 
   colorMappingFunction(dump?: ITypedDump | string | ((v: number) => string)): IColorMappingFunction;
-  mappingFunction(dump?: ITypedDump): IMappingFunction;
+  mappingFunction(dump?: ITypedDump | IScriptMappingFunctionType): IMappingFunction;
   categoricalColorMappingFunction(dump: ITypedDump | undefined, categories: ICategory[]): ICategoricalColorMappingFunction;
 }
 

diff --git a/src/provider/ADataProvider.ts b/src/provider/ADataProvider.ts
@@ -1,14 +1,14 @@
 import {AEventDispatcher, debounce, ISequence, OrderedSet, IDebounceContext, IEventListener, suffix, IEventContext} from '../internal';
-import {Column, Ranking, AggregateGroupColumn, createAggregateDesc, IAggregateGroupColumnDesc, isSupportType, EDirtyReason, RankColumn, createRankDesc, createSelectionDesc, IColumnDesc, IDataRow, IGroup, IndicesArray, IOrderedGroup, ISelectionColumnDesc, EAggregationState, IColumnDump, IRankingDump, IColorMappingFunctionConstructor, IMappingFunctionConstructor, ITypeFactory, ITypedDump} from '../model';
-import {models, colorMappingFunctions, mappingFunctions} from '../model/models';
+import {Column, Ranking, AggregateGroupColumn, createAggregateDesc, IAggregateGroupColumnDesc, isSupportType, EDirtyReason, RankColumn, createRankDesc, createSelectionDesc, IColumnDesc, IDataRow, IGroup, IndicesArray, IOrderedGroup, ISelectionColumnDesc, EAggregationState, IColumnDump, IRankingDump, IColorMappingFunctionConstructor, IMappingFunctionConstructor, ITypeFactory} from '../model';
+import {models} from '../model/models';
 import {forEachIndices, everyIndices, toGroupID, unifyParents} from '../model/internal';
 import {IDataProvider, IDataProviderDump, IDataProviderOptions, SCHEMA_REF, IExportOptions, IAggregationStrategy} from './interfaces';
 import {exportRanking, map2Object, object2Map} from './utils';
 import {IRenderTasks} from '../renderer';
 import {IColumnConstructor} from '../model/Column';
 import {restoreCategoricalColorMapping} from '../model/CategoricalColorMappingFunction';
-import {createColorMappingFunction} from '../model/ColorMappingFunction';
-import {createMappingFunction} from '../model/MappingFunction';
+import {createColorMappingFunction, colorMappingFunctions} from '../model/ColorMappingFunction';
+import {createMappingFunction, mappingFunctions} from '../model/MappingFunction';