From f9cd74b54e0467bcfebee22c824d756d4dca8eb5 Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Thu, 24 Oct 2024 11:37:47 -0600 Subject: [PATCH] change colorway --- .../dynamic-compare/services/hazard-plots.service.ts | 3 +-- .../dynamic-compare/services/spectra-plots.service.ts | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/hazard-plots.service.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/hazard-plots.service.ts index 1d6f9c21b..7ec681590 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/hazard-plots.service.ts +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/hazard-plots.service.ts @@ -14,7 +14,6 @@ import { } from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/model'; import {Parameter} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils/metadata'; import {PlotlyPlot} from '@ghsc/nshmp-utils-ts/libs/plotly'; -import * as d3Color from 'd3-scale-chromatic'; import {Dash, PlotData} from 'plotly.js'; import { @@ -380,7 +379,7 @@ export class HazardPlotsService { options.availableModels ); - const colors = d3Color.schemeCategory10; + const colors = plotUtils.COLORWAY; let count = 0; return hazardCurves.map(data => { diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/spectra-plots.service.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/spectra-plots.service.ts index 6d19c71df..fdb820d83 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/spectra-plots.service.ts +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/spectra-plots.service.ts @@ -1,6 +1,6 @@ import {Injectable} from '@angular/core'; import {FormGroupControls} from '@ghsc/nshmp-lib-ng/nshmp'; -import {NshmpPlot} from '@ghsc/nshmp-lib-ng/plot'; +import {NshmpPlot, plotUtils} from '@ghsc/nshmp-lib-ng/plot'; import {Imt, imtToPeriod} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/gmm'; import { SourceType, @@ -8,7 +8,6 @@ import { } from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/model'; import {Parameter} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils/metadata'; import {PlotlyPlot} from '@ghsc/nshmp-utils-ts/libs/plotly'; -import * as d3Color from 'd3-scale-chromatic'; import {Dash, PlotData} from 'plotly.js'; import { @@ -223,7 +222,7 @@ export class SpectraPlotsService { const spectraFilter = (spectra: Spectra) => spectra.sourceType === SourceType.TOTAL; const name = (modelInfo: Parameter) => modelInfo.display; - const colors = d3Color.schemeCategory10; + const colors = plotUtils.COLORWAY; return this.createSpectraPlot({ availableModels, @@ -407,7 +406,7 @@ export class SpectraPlotsService { const lines: Partial<PlotData>[] = []; let count = 0; const lineColors = - options.colors === undefined ? d3Color.schemeCategory10 : options.colors; + options.colors === undefined ? plotUtils.COLORWAY : options.colors; spectra.map(spectrum => { const color = -- GitLab