diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html index 5bde83f8e8c36af493e24c8044ed0abbb9fb99f5..ef6d2a8806a58e8945043ed44ceb9b67c8db67b7 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html @@ -12,7 +12,7 @@ <!-- Settings --> <nshmp-template-settings> - <app-plot-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.spec.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.spec.ts index 57743787f09123ea7b6b8f9114677e90920d7a2c..3e6fc9afb69f57623b4fb869b1ce597e5dc1d357 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.spec.ts @@ -9,7 +9,7 @@ import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {FaultControlComponent} from './components/fault-control/fault-control.component'; import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component'; -import {PlotSettingsComponent} from './components/plot-settings/plot-settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {PlotsComponent} from './components/plots/plots.component'; describe('AppComponent', () => { @@ -25,7 +25,7 @@ describe('AppComponent', () => { PlotsComponent, FaultControlComponent, ParameterSummaryComponent, - PlotSettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ], providers: [ diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts index 9b1366a8ad1af640377e270060e77b777d0a651f..44a525bbc130dffbdfce3c99eccd63a6b786529a 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts @@ -13,7 +13,7 @@ import {devNavigation} from 'projects/nshmp-apps/src/shared/utils/navigation.uti import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; -import {PlotSettingsComponent} from './components/plot-settings/plot-settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; @Component({ @@ -26,7 +26,7 @@ import {AppService} from './services/app.service'; NshmpLibNgAboutPageComponent, ControlPanelComponent, ContentComponent, - PlotSettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ], selector: 'app-app', diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.html rename to projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.scss b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.scss rename to projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.spec.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 65% rename from projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.spec.ts rename to projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.spec.ts index 7e8e9ecfcb3122bb29ad6c109ae5e92d3b8c72c0..70a192deff7416ff499295cbe86287cfa9273100 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -2,19 +2,19 @@ import {provideHttpClient} from '@angular/common/http'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; -import {PlotSettingsComponent} from './plot-settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; describe('PlotSettingsComponent', () => { - let component: PlotSettingsComponent; - let fixture: ComponentFixture<PlotSettingsComponent>; + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [PlotSettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [provideHttpClient(), provideNoopAnimations()], }).compileComponents(); - fixture = TestBed.createComponent(PlotSettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 88% rename from projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.ts rename to projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.ts index a1337f9d6223ce9abf0637e5fc204964d2bf8c22..4aba1029c8062c814274e31f1d2d60a75ac35019 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings/plot-settings.component.ts +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plot-settings-panel/plot-settings-panel.component.ts @@ -25,12 +25,12 @@ import {AppService} from '../../services/app.service'; MatExpansionPanelHeader, MatExpansionPanelTitle, ], - selector: 'app-plot-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './plot-settings.component.scss', - templateUrl: './plot-settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class PlotSettingsComponent implements OnDestroy { +export class PlotSettingsPanelComponent implements OnDestroy { /** Ground motion plot */ groundMotionPlot = computed(() => { this.settingsFormSubscription?.unsubscribe(); diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html index 104704efb97902e176f779c8b220a7aae1c91a09..375b90fa6d390e2841ee1455e38a1a4a9a7a7906 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html @@ -12,7 +12,7 @@ <!-- Settings --> <nshmp-template-settings> - <app-plot-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.spec.ts index 9809620ec6eab3096234083cb5557222b12b1745..b0069e6b547b499ef71c0d35ecc94d2112bb9604 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.spec.ts @@ -9,7 +9,7 @@ import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {HazardDataComponent} from './components/hazard-data/hazard-data.component'; import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component'; -import {PlotSettingsComponent} from './components/plot-settings/plot-settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {PlotsComponent} from './components/plots/plots.component'; import {SpectraDataComponent} from './components/spectra-data/spectra-data.component'; import {TableDataPanelComponent} from './components/table-data-panel/table-data-panel.component'; @@ -28,7 +28,7 @@ describe('AppComponent', () => { HazardDataComponent, SpectraDataComponent, TableDataPanelComponent, - PlotSettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ParameterSummaryComponent, ], diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts index 254075bee441dabcb2f50e293a434641162af587..48e7c37bb19693cfbbc5fda04476fe5de6564ca0 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts @@ -15,7 +15,7 @@ import {devNavigation} from 'projects/nshmp-apps/src/shared/utils/navigation.uti import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; -import {PlotSettingsComponent} from './components/plot-settings/plot-settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; @Component({ @@ -29,7 +29,7 @@ import {AppService} from './services/app.service'; NshmpLibNgAboutPageComponent, ControlPanelComponent, ContentComponent, - PlotSettingsComponent, + PlotSettingsPanelComponent, AboutComponent, AsyncPipe, ], diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.html b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.html rename to projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.scss b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.scss rename to projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 64% rename from projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.spec.ts rename to projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.spec.ts index 29446243669399ceb07960abe2eede6a9c3289c2..ac3c9e960031abd5969ed050fcf75b205aa1bf93 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -3,15 +3,15 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; import {provideRouter} from '@angular/router'; -import {PlotSettingsComponent} from './plot-settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; -describe('PlotSettingsComponent', () => { - let component: PlotSettingsComponent; - let fixture: ComponentFixture<PlotSettingsComponent>; +describe('PlotSettingsPanelComponent', () => { + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [PlotSettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [ provideHttpClient(), provideNoopAnimations(), @@ -19,7 +19,7 @@ describe('PlotSettingsComponent', () => { ], }).compileComponents(); - fixture = TestBed.createComponent(PlotSettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 93% rename from projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.ts rename to projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.ts index 078f1479fc60cea1b14e2a2306128cb6d68f05be..d2c363f74c2e0489a5a13b4f9dd19b6278a5bc87 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.ts +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings-panel/plot-settings-panel.component.ts @@ -27,12 +27,12 @@ import {AppService} from '../../services/app.service'; MatExpansionPanelTitle, AsyncPipe, ], - selector: 'app-plot-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './plot-settings.component.scss', - templateUrl: './plot-settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class PlotSettingsComponent { +export class PlotSettingsPanelComponent { /** Hazard plot data */ private hazardPlot = computed(() => this.service.plots().get(Plots.HAZARD)); diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html index f5216f0dcee6284d8d2fd2a0da743b24082f36d7..5e121fa46dc54ead22e5a80295f01cda9ae6bb44 100644 --- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html +++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html @@ -9,7 +9,7 @@ </nshmp-template-plot-content> <nshmp-template-settings> - <app-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.spec.ts b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.spec.ts index 4e5f7c79f52663987119b9939274bef4a9d4573f..c69626592d855ab9fb6c66be279d5853a5a8e169 100644 --- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.spec.ts @@ -7,7 +7,7 @@ import {AppComponent} from './app.component'; import {AboutComponent} from './components/about/about.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {PlotComponent} from './components/plot/plot.component'; -import {SettingsComponent} from './components/settings/settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; describe('ExceedanceExplorerComponent', () => { let component: AppComponent; @@ -17,7 +17,7 @@ describe('ExceedanceExplorerComponent', () => { TestBed.configureTestingModule({ imports: [ AppComponent, - SettingsComponent, + PlotSettingsPanelComponent, PlotComponent, ControlPanelComponent, AboutComponent, diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts index 3ef6be1b7241e9d0acb99b5a15ff540642a06bcb..6fe0117fb816c6108fe8b50393385d60f049c6c4 100644 --- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts +++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts @@ -13,7 +13,7 @@ import {devNavigation} from 'projects/nshmp-apps/src/shared/utils/navigation.uti import {AboutComponent} from './components/about/about.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {PlotComponent} from './components/plot/plot.component'; -import {SettingsComponent} from './components/settings/settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; /** * Entrypoint for exceedance explorer development application. @@ -30,7 +30,7 @@ import {SettingsComponent} from './components/settings/settings.component'; NshmpLibNgAboutPageComponent, ControlPanelComponent, PlotComponent, - SettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ], selector: 'app-app', diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.html b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.html rename to projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.scss b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.scss rename to projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.spec.ts b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 69% rename from projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.spec.ts rename to projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.spec.ts index f8b388bee652471b95cf97863e47e0e238371bfe..0dd8a3942e25274456088239d06bf13b1647e85a 100644 --- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -2,22 +2,22 @@ import {provideHttpClient} from '@angular/common/http'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; -import {SettingsComponent} from './settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; describe('ExceedancePlotSettingsComponent', () => { - let component: SettingsComponent; - let fixture: ComponentFixture<SettingsComponent>; + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [SettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [provideHttpClient(), provideNoopAnimations()], teardown: {destroyAfterEach: false}, }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(SettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.ts b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 79% rename from projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.ts rename to projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.ts index a49a553bf9e8542cbb485c876f5efe9d2cd8cdff..b9cb06304f19d311f9ff4e51ecd331b910a0023e 100644 --- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/settings/settings.component.ts +++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/plot-settings-panel/plot-settings-panel.component.ts @@ -18,12 +18,12 @@ import {AppService} from '../../services/app.service'; NshmpLibNgPlotResetPlotSettingsComponent, AsyncPipe, ], - selector: 'app-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './settings.component.scss', - templateUrl: './settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class SettingsComponent { +export class PlotSettingsPanelComponent { plot = this.service.plot; constructor(public service: AppService) {} diff --git a/projects/nshmp-apps/src/app/gmm/distance/app.component.html b/projects/nshmp-apps/src/app/gmm/distance/app.component.html index 8a5860704efdbaad630262e902dd706e092ef6b0..cdf8fb7e3520b4e27986db1fdd7d0edf776c1372 100644 --- a/projects/nshmp-apps/src/app/gmm/distance/app.component.html +++ b/projects/nshmp-apps/src/app/gmm/distance/app.component.html @@ -9,7 +9,7 @@ </nshmp-template-plot-content> <nshmp-template-settings> - <app-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/gmm/distance/app.component.spec.ts b/projects/nshmp-apps/src/app/gmm/distance/app.component.spec.ts index dba04b4994097d6ddbd0682417e7628ed18fbcc8..22435a807de6389589b6debefa3faa1a6b7498ae 100644 --- a/projects/nshmp-apps/src/app/gmm/distance/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/gmm/distance/app.component.spec.ts @@ -8,8 +8,8 @@ import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {PlotsComponent} from './components/plots/plots.component'; -import {SettingsComponent} from './components/settings/settings.component'; describe('GmmDistanceComponent', () => { let component: AppComponent; @@ -21,7 +21,7 @@ describe('GmmDistanceComponent', () => { AppComponent, ControlPanelComponent, PlotsComponent, - SettingsComponent, + PlotSettingsPanelComponent, ContentComponent, AboutComponent, ParameterSummaryComponent, diff --git a/projects/nshmp-apps/src/app/gmm/distance/app.component.ts b/projects/nshmp-apps/src/app/gmm/distance/app.component.ts index 78bfe82b02952318c0cf126bc6af2ebe0687e7aa..e3666f2c963fcd39aff169a74d255fc9f465cf83 100644 --- a/projects/nshmp-apps/src/app/gmm/distance/app.component.ts +++ b/projects/nshmp-apps/src/app/gmm/distance/app.component.ts @@ -13,7 +13,7 @@ import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils' import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; -import {SettingsComponent} from './components/settings/settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; /** @@ -33,7 +33,7 @@ import {AppService} from './services/app.service'; NshmpLibNgAboutPageComponent, ControlPanelComponent, ContentComponent, - SettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ], selector: 'app-app', diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.html b/projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.html rename to projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.scss b/projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.scss rename to projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.spec.ts b/projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 69% rename from projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.spec.ts rename to projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.spec.ts index babda5391913c6f2da26ab4a2b0765cdaea05ec0..ac485aa2aa443894f6769407d3d95b6ccd68f85e 100644 --- a/projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -2,22 +2,22 @@ import {provideHttpClient} from '@angular/common/http'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; -import {SettingsComponent} from './settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; describe('GmmDistancePlotSettingsComponent', () => { - let component: SettingsComponent; - let fixture: ComponentFixture<SettingsComponent>; + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [SettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [provideHttpClient(), provideNoopAnimations()], teardown: {destroyAfterEach: false}, }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(SettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.ts b/projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 83% rename from projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.ts rename to projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.ts index 89352e480e7f4c6b7aec123ea5b12eda10bf7386..31f9594343aa698f39c6a04006e477d0e0addb78 100644 --- a/projects/nshmp-apps/src/app/gmm/distance/components/settings/settings.component.ts +++ b/projects/nshmp-apps/src/app/gmm/distance/components/plot-settings-panel/plot-settings-panel.component.ts @@ -18,12 +18,12 @@ import {AppService} from '../../services/app.service'; NshmpLibNgPlotSettingsComponent, AsyncPipe, ], - selector: 'app-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './settings.component.scss', - templateUrl: './settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class SettingsComponent { +export class PlotSettingsPanelComponent { /** Plot data */ meanPlot = this.service.meanPlotState; diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html index 109357b1ab23357d0043606dce4288796f4ce2bc..cdf8fb7e3520b4e27986db1fdd7d0edf776c1372 100644 --- a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html +++ b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html @@ -9,7 +9,7 @@ </nshmp-template-plot-content> <nshmp-template-settings> - <app-plots-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.spec.ts b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.spec.ts index 62d2c415b6298914f13822465317109f9af2907f..f3e250613f8568acf90def6f181a244fa70cfd42 100644 --- a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.spec.ts @@ -8,8 +8,8 @@ import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {PlotsComponent} from './components/plots/plots.component'; -import {PlotsSettingsComponent} from './components/plots-settings/plots-settings.component'; describe('MainComponent', () => { let component: AppComponent; @@ -22,7 +22,7 @@ describe('MainComponent', () => { ControlPanelComponent, ContentComponent, PlotsComponent, - PlotsSettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ParameterSummaryComponent, ], diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts index b661b5dc13b993e5f71db36bcc068b932c70e458..2e1e32de8462fcbb796714afa842313b1a344d87 100644 --- a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts +++ b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts @@ -13,7 +13,7 @@ import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils' import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; -import {PlotsSettingsComponent} from './components/plots-settings/plots-settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; /** @@ -33,7 +33,7 @@ import {AppService} from './services/app.service'; NshmpLibNgAboutPageComponent, ControlPanelComponent, ContentComponent, - PlotsSettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ], selector: 'app-app', diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.html rename to projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.scss b/projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.scss rename to projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.spec.ts b/projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 63% rename from projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.spec.ts rename to projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.spec.ts index f32cb499109bcd69ddd134227f47a21b493974ff..fe3897a2e27177b40df5bafc33db226b4dfaea02 100644 --- a/projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -2,22 +2,22 @@ import {provideHttpClient} from '@angular/common/http'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; -import {PlotsSettingsComponent} from './plots-settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; -describe('PlotsSettingsComponent', () => { - let component: PlotsSettingsComponent; - let fixture: ComponentFixture<PlotsSettingsComponent>; +describe('PlotSettingsPanelComponent', () => { + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [PlotsSettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [provideHttpClient(), provideNoopAnimations()], teardown: {destroyAfterEach: false}, }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(PlotsSettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.ts b/projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 86% rename from projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.ts rename to projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.ts index ac6f4a09d56f0248222c9d77afdd4f5a88e0c3d3..7e809c808e8562cb94bd20f1238a7eecaa1760f3 100644 --- a/projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.ts +++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/plot-settings-panel/plot-settings-panel.component.ts @@ -18,12 +18,12 @@ import {AppService} from '../../services/app.service'; NshmpLibNgPlotSettingsComponent, AsyncPipe, ], - selector: 'app-plots-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './plots-settings.component.scss', - templateUrl: './plots-settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class PlotsSettingsComponent { +export class PlotSettingsPanelComponent { PlotIds = gmmUtils.PlotType; /** Mean plot state */ diff --git a/projects/nshmp-apps/src/app/gmm/spectra/app.component.html b/projects/nshmp-apps/src/app/gmm/spectra/app.component.html index 109357b1ab23357d0043606dce4288796f4ce2bc..cdf8fb7e3520b4e27986db1fdd7d0edf776c1372 100644 --- a/projects/nshmp-apps/src/app/gmm/spectra/app.component.html +++ b/projects/nshmp-apps/src/app/gmm/spectra/app.component.html @@ -9,7 +9,7 @@ </nshmp-template-plot-content> <nshmp-template-settings> - <app-plots-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/gmm/spectra/app.component.spec.ts b/projects/nshmp-apps/src/app/gmm/spectra/app.component.spec.ts index 40505e38312328bd7388622ca11525014cfe1473..887dbbff824962855470c3a2c44480f35b79de08 100644 --- a/projects/nshmp-apps/src/app/gmm/spectra/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/gmm/spectra/app.component.spec.ts @@ -8,8 +8,8 @@ import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {PlotsComponent} from './components/plots/plots.component'; -import {PlotsSettingsComponent} from './components/plots-settings/plots-settings.component'; describe('MainComponent', () => { let component: AppComponent; @@ -21,7 +21,7 @@ describe('MainComponent', () => { AppComponent, ContentComponent, PlotsComponent, - PlotsSettingsComponent, + PlotSettingsPanelComponent, ControlPanelComponent, AboutComponent, ParameterSummaryComponent, diff --git a/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts b/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts index c4d9b5508888594023554a58ed0c2474c8375476..9f28111e3932c4a821b5ff01f9e4c60e138dccd4 100644 --- a/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts +++ b/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts @@ -13,7 +13,7 @@ import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils' import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; -import {PlotsSettingsComponent} from './components/plots-settings/plots-settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; /** @@ -33,7 +33,7 @@ import {AppService} from './services/app.service'; NshmpLibNgAboutPageComponent, ControlPanelComponent, ContentComponent, - PlotsSettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ], selector: 'app-main', diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.html rename to projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.scss b/projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.scss rename to projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.spec.ts b/projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 63% rename from projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.spec.ts rename to projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.spec.ts index f32cb499109bcd69ddd134227f47a21b493974ff..fe3897a2e27177b40df5bafc33db226b4dfaea02 100644 --- a/projects/nshmp-apps/src/app/gmm/magnitude/components/plots-settings/plots-settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -2,22 +2,22 @@ import {provideHttpClient} from '@angular/common/http'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; -import {PlotsSettingsComponent} from './plots-settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; -describe('PlotsSettingsComponent', () => { - let component: PlotsSettingsComponent; - let fixture: ComponentFixture<PlotsSettingsComponent>; +describe('PlotSettingsPanelComponent', () => { + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [PlotsSettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [provideHttpClient(), provideNoopAnimations()], teardown: {destroyAfterEach: false}, }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(PlotsSettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.ts b/projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 86% rename from projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.ts rename to projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.ts index 1f09822d1730ebfdadea0cbe8addf88ba8121944..b757d7201c5a01059648d7e8b3c4adb14e1e4aeb 100644 --- a/projects/nshmp-apps/src/app/gmm/spectra/components/plots-settings/plots-settings.component.ts +++ b/projects/nshmp-apps/src/app/gmm/spectra/components/plot-settings-panel/plot-settings-panel.component.ts @@ -18,12 +18,12 @@ import {AppService} from '../../services/app.service'; NshmpLibNgPlotSettingsComponent, AsyncPipe, ], - selector: 'app-plots-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './plots-settings.component.scss', - templateUrl: './plots-settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class PlotsSettingsComponent { +export class PlotSettingsPanelComponent { PlotIds = gmmUtils.PlotType; /** Mean plot state */ diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html index 9de48a9ad0297f6212fa12b646af6cc22c9b0aef..03bdde34cccaca1ef8567a9c19e937c0a8fbd4bd 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html +++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html @@ -1,7 +1,7 @@ <nshmp-lib-ng-template [navigationList]="navigationList" [title]="title"> <nshmp-template-content-container> <nshmp-template-control-panel> - <app-control /> + <app-control-panel /> </nshmp-template-control-panel> <nshmp-template-plot-content> @@ -9,7 +9,7 @@ </nshmp-template-plot-content> <nshmp-template-settings> - <app-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.spec.ts b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.spec.ts index 85c154861426d6b19d31efd83d9064ace66b6521..8cece8212c135dc200ab0c5a425b54ee77aa41e6 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.spec.ts @@ -6,10 +6,10 @@ import {provideRouter} from '@angular/router'; import {AppComponent} from './app.component'; import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; -import {ControlComponent} from './components/control/control.component'; +import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {PlotsComponent} from './components/plots/plots.component'; -import {SettingsComponent} from './components/settings/settings.component'; describe('MainComponent', () => { let component: AppComponent; @@ -21,8 +21,8 @@ describe('MainComponent', () => { AppComponent, ContentComponent, PlotsComponent, - ControlComponent, - SettingsComponent, + ControlPanelComponent, + PlotSettingsPanelComponent, AboutComponent, ParameterSummaryComponent, ], diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts index 124bf85f850e720985ec2b24a2e64f2da545023a..18e3eba4bdbc3a386a7cfe893688064c6bf73f7d 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts +++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts @@ -14,8 +14,8 @@ import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils' import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; -import {ControlComponent} from './components/control/control.component'; -import {SettingsComponent} from './components/settings/settings.component'; +import {ControlPanelComponent} from './components/control-panel/control-panel.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; /** @@ -30,9 +30,9 @@ import {AppService} from './services/app.service'; NshmpLibNgAboutPageComponent, NshmpLibNgHazardProvisionalModelComponent, NshmpTemplateSettingsComponent, - ControlComponent, + ControlPanelComponent, ContentComponent, - SettingsComponent, + PlotSettingsPanelComponent, AboutComponent, AsyncPipe, ], diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.html rename to projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.html diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.scss b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.scss rename to projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.scss diff --git a/projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.spec.ts b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.spec.ts similarity index 69% rename from projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.spec.ts rename to projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.spec.ts index cdadff990714b2125891239f69da9ae5a6ed62a2..6b91d5feccfbbc9c9b21acbd29d67ae108d4cd99 100644 --- a/projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.spec.ts @@ -3,15 +3,15 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; import {provideRouter} from '@angular/router'; -import {SettingsComponent} from './settings.component'; +import {ControlPanelComponent} from './control-panel.component'; -describe('SettingsComponent', () => { - let component: SettingsComponent; - let fixture: ComponentFixture<SettingsComponent>; +describe('ControlPanelComponent', () => { + let component: ControlPanelComponent; + let fixture: ComponentFixture<ControlPanelComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [SettingsComponent], + imports: [ControlPanelComponent], providers: [ provideHttpClient(), provideNoopAnimations(), @@ -22,7 +22,7 @@ describe('SettingsComponent', () => { }); beforeEach(() => { - fixture = TestBed.createComponent(SettingsComponent); + fixture = TestBed.createComponent(ControlPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.ts b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.ts similarity index 94% rename from projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.ts rename to projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.ts index 50ab38f0299604d77549cfdb012bc9d5eff67a76..32ffba8a78b8b4cd478f612ce0e942ba7ea40da3 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.ts +++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.ts @@ -27,9 +27,9 @@ import { SourceType, sourceTypeToCapitalCase, } from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/model'; -import {environment} from 'projects/nshmp-apps/src/environments/environment'; import {combineLatest, Subscription} from 'rxjs'; +import {environment} from '../../../../../environments/environment'; import {AppService} from '../../services/app.service'; /** @@ -52,12 +52,12 @@ import {AppService} from '../../services/app.service'; AsyncPipe, ReactiveFormsModule, ], - selector: 'app-control', + selector: 'app-control-panel', standalone: true, - styleUrl: './control.component.scss', - templateUrl: './control.component.html', + styleUrl: './control-panel.component.scss', + templateUrl: './control-panel.component.html', }) -export class ControlComponent implements OnInit, OnDestroy { +export class ControlPanelComponent implements OnInit, OnDestroy { /** Max and min bounds for return periods */ returnPeriodBounds = RETURN_PERIOD_BOUNDS; /** List of return periods */ diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.html rename to projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.scss b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.scss rename to projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.spec.ts b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 66% rename from projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.spec.ts rename to projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.spec.ts index 04eb3901946d409d061e02dddf9daa3ab336f6e4..ef7b05b5522d660fd40ffe44c9515b6daa010213 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.spec.ts +++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -3,15 +3,15 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; import {provideRouter} from '@angular/router'; -import {ControlComponent} from './control.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; -describe('ControlComponent', () => { - let component: ControlComponent; - let fixture: ComponentFixture<ControlComponent>; +describe('PlotSettingsPanelComponent', () => { + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ControlComponent], + imports: [PlotSettingsPanelComponent], providers: [ provideHttpClient(), provideNoopAnimations(), @@ -22,7 +22,7 @@ describe('ControlComponent', () => { }); beforeEach(() => { - fixture = TestBed.createComponent(ControlComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.ts b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 88% rename from projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.ts rename to projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.ts index c1bc88e055226044fc28ff3ebed3fcfe2809d9db..d789abad4a5a6837e62a42760887be86cb293c52 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.ts +++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.ts @@ -19,12 +19,12 @@ import {AppService} from '../../services/app.service'; NshmpLibNgPlotResetPlotSettingsComponent, MatExpansionModule, ], - selector: 'app-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './settings.component.scss', - templateUrl: './settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class SettingsComponent { +export class PlotSettingsPanelComponent { /** Hazard plot state */ hazardPlot = this.service.hazardPlotState; /** Hazard plot settings */ diff --git a/projects/nshmp-apps/src/app/hazard/static/app.component.html b/projects/nshmp-apps/src/app/hazard/static/app.component.html index 8a5860704efdbaad630262e902dd706e092ef6b0..cdf8fb7e3520b4e27986db1fdd7d0edf776c1372 100644 --- a/projects/nshmp-apps/src/app/hazard/static/app.component.html +++ b/projects/nshmp-apps/src/app/hazard/static/app.component.html @@ -9,7 +9,7 @@ </nshmp-template-plot-content> <nshmp-template-settings> - <app-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/hazard/static/app.component.spec.ts b/projects/nshmp-apps/src/app/hazard/static/app.component.spec.ts index 2659c69fd04ba9e709b80086b6a00318d96c1c4b..c82c67b707d857c4d5436e3142aed951a884a420 100644 --- a/projects/nshmp-apps/src/app/hazard/static/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/hazard/static/app.component.spec.ts @@ -9,8 +9,8 @@ import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {CurveDataComponent} from './components/curve-data/curve-data.component'; import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {PlotsComponent} from './components/plots/plots.component'; -import {SettingsComponent} from './components/settings/settings.component'; import {SpectrumDataComponent} from './components/spectrum-data/spectrum-data.component'; describe('StaticHazardComponent', () => { @@ -26,7 +26,7 @@ describe('StaticHazardComponent', () => { SpectrumDataComponent, CurveDataComponent, ControlPanelComponent, - SettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ParameterSummaryComponent, ], diff --git a/projects/nshmp-apps/src/app/hazard/static/app.component.ts b/projects/nshmp-apps/src/app/hazard/static/app.component.ts index fba2e7ce217e1bfb0787eb10404b28a0c7a7ef42..52f7e2d42c9a4c6b4e7f828bac10f2b6e3524376 100644 --- a/projects/nshmp-apps/src/app/hazard/static/app.component.ts +++ b/projects/nshmp-apps/src/app/hazard/static/app.component.ts @@ -13,7 +13,7 @@ import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils' import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; -import {SettingsComponent} from './components/settings/settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; /** @@ -29,7 +29,7 @@ import {AppService} from './services/app.service'; NshmpTemplateSettingsComponent, ControlPanelComponent, ContentComponent, - SettingsComponent, + PlotSettingsPanelComponent, AboutComponent, ], selector: 'app-app', diff --git a/projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.html b/projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.html rename to projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.scss b/projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.scss rename to projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.spec.ts b/projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 71% rename from projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.spec.ts rename to projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.spec.ts index 84bf5bd241f50d6347c436daa923d70bb91b714a..aea8b0520d8c99f3c3bdeeacb7b7e66b5311455b 100644 --- a/projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -3,15 +3,15 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; import {provideRouter} from '@angular/router'; -import {SettingsComponent} from './settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; describe('StaticHazardSettingsComponent', () => { - let component: SettingsComponent; - let fixture: ComponentFixture<SettingsComponent>; + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [SettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [ provideNoopAnimations(), provideHttpClient(), @@ -22,7 +22,7 @@ describe('StaticHazardSettingsComponent', () => { })); beforeEach(() => { - fixture = TestBed.createComponent(SettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.ts b/projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 88% rename from projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.ts rename to projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.ts index 97ea383ef7c885cb3b034fa529e1ac5f140bd3fc..8e1db4460f059a65588373f3dc2867ea9cff9ca7 100644 --- a/projects/nshmp-apps/src/app/hazard/static/components/settings/settings.component.ts +++ b/projects/nshmp-apps/src/app/hazard/static/components/plot-settings-panel/plot-settings-panel.component.ts @@ -21,12 +21,12 @@ import {AppService} from '../../services/app.service'; AsyncPipe, MatExpansionModule, ], - selector: 'app-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './settings.component.scss', - templateUrl: './settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class SettingsComponent { +export class PlotSettingsPanelComponent { /** Hazard plot state */ private hazardPlot = this.service.hazardPlotState; /** Spectra plot state */ diff --git a/projects/nshmp-apps/src/app/source/mfd/app.component.html b/projects/nshmp-apps/src/app/source/mfd/app.component.html index d19cf9d9d4ba4a69da3e2f1f242f7aee5700d8d2..03bdde34cccaca1ef8567a9c19e937c0a8fbd4bd 100644 --- a/projects/nshmp-apps/src/app/source/mfd/app.component.html +++ b/projects/nshmp-apps/src/app/source/mfd/app.component.html @@ -9,7 +9,7 @@ </nshmp-template-plot-content> <nshmp-template-settings> - <app-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/source/mfd/app.component.spec.ts b/projects/nshmp-apps/src/app/source/mfd/app.component.spec.ts index bf0f1fb0c00070c0b85067e2d1282baee96f85e9..d6955abe86242d4320f9d7514d245e0b7c6fe7e2 100644 --- a/projects/nshmp-apps/src/app/source/mfd/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/source/mfd/app.component.spec.ts @@ -10,8 +10,8 @@ import {ControlPanelComponent} from './components/control-panel/control-panel.co import {DataComponent} from './components/data/data.component'; import {LogicTreeComponent} from './components/logic-tree/logic-tree.component'; import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {PlotsComponent} from './components/plots/plots.component'; -import {SettingsComponent} from './components/settings/settings.component'; describe('AppComponent', () => { let component: AppComponent; @@ -24,7 +24,7 @@ describe('AppComponent', () => { ControlPanelComponent, ContentComponent, PlotsComponent, - SettingsComponent, + PlotSettingsPanelComponent, DataComponent, AboutComponent, LogicTreeComponent, diff --git a/projects/nshmp-apps/src/app/source/mfd/app.component.ts b/projects/nshmp-apps/src/app/source/mfd/app.component.ts index 6edab836485af1614e8db90ca61124406534e9f2..b02196e22f66df37a1b9f408d340dc7c456e94f6 100644 --- a/projects/nshmp-apps/src/app/source/mfd/app.component.ts +++ b/projects/nshmp-apps/src/app/source/mfd/app.component.ts @@ -16,7 +16,7 @@ import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils' import {AboutComponent} from './components/about/about.component'; import {ContentComponent} from './components/content/content.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; -import {SettingsComponent} from './components/settings/settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; /** @@ -36,7 +36,7 @@ import {AppService} from './services/app.service'; NshmpLibNgAboutPageComponent, ControlPanelComponent, ContentComponent, - SettingsComponent, + PlotSettingsPanelComponent, AboutComponent, AsyncPipe, ], diff --git a/projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.html b/projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.html rename to projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.scss b/projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.scss rename to projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.spec.ts b/projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 66% rename from projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.spec.ts rename to projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.spec.ts index cdadff990714b2125891239f69da9ae5a6ed62a2..ef7b05b5522d660fd40ffe44c9515b6daa010213 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -3,15 +3,15 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; import {provideRouter} from '@angular/router'; -import {SettingsComponent} from './settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; -describe('SettingsComponent', () => { - let component: SettingsComponent; - let fixture: ComponentFixture<SettingsComponent>; +describe('PlotSettingsPanelComponent', () => { + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [SettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [ provideHttpClient(), provideNoopAnimations(), @@ -22,7 +22,7 @@ describe('SettingsComponent', () => { }); beforeEach(() => { - fixture = TestBed.createComponent(SettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.ts b/projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 85% rename from projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.ts rename to projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.ts index ae5f75f89d2f7c791ab94b8a4a2d8b7b1629398c..0b1a202576b25c968a1c03513e012720ee82a267 100644 --- a/projects/nshmp-apps/src/app/source/mfd/components/settings/settings.component.ts +++ b/projects/nshmp-apps/src/app/source/mfd/components/plot-settings-panel/plot-settings-panel.component.ts @@ -21,12 +21,12 @@ import {AppService} from '../../services/app.service'; AsyncPipe, MatExpansionModule, ], - selector: 'app-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './settings.component.scss', - templateUrl: './settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class SettingsComponent { +export class PlotSettingsPanelComponent { /** MFD plot state */ private mfdPlot = this.service.mfdPlotState; diff --git a/projects/nshmp-apps/src/app/source/model-maps/app.component.html b/projects/nshmp-apps/src/app/source/model-maps/app.component.html index b839e0747b08cfbbbc8e8d47cc31c6e841de4310..8c5371544bee801ad470186c97b75f15786f6d84 100644 --- a/projects/nshmp-apps/src/app/source/model-maps/app.component.html +++ b/projects/nshmp-apps/src/app/source/model-maps/app.component.html @@ -9,7 +9,7 @@ </nshmp-template-map-content> <nshmp-template-settings> - <app-settings /> + <app-plot-settings-panel /> </nshmp-template-settings> </nshmp-template-content-container> diff --git a/projects/nshmp-apps/src/app/source/model-maps/app.component.spec.ts b/projects/nshmp-apps/src/app/source/model-maps/app.component.spec.ts index 2368bb2d6857705fd8670166ee3557b9d87d2bc3..f76f02b5d08ae70ce71cfd02b718e01bcabd37fa 100644 --- a/projects/nshmp-apps/src/app/source/model-maps/app.component.spec.ts +++ b/projects/nshmp-apps/src/app/source/model-maps/app.component.spec.ts @@ -9,7 +9,7 @@ import {ControlPanelComponent} from './components/control-panel/control-panel.co import {InfoPopupComponent} from './components/info-popup/info-popup.component'; import {LegendComponent} from './components/legend/legend.component'; import {MapComponent} from './components/map/map.component'; -import {SettingsComponent} from './components/settings/settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; describe('MainComponent', () => { let component: AppComponent; @@ -23,7 +23,7 @@ describe('MainComponent', () => { MapComponent, AboutComponent, LegendComponent, - SettingsComponent, + PlotSettingsPanelComponent, InfoPopupComponent, ], providers: [ diff --git a/projects/nshmp-apps/src/app/source/model-maps/app.component.ts b/projects/nshmp-apps/src/app/source/model-maps/app.component.ts index 24461e876ae15b9639ab0bebd3b471ae30568924..0fe2e36c7aba38a8101c69539a32f20239bb4749 100644 --- a/projects/nshmp-apps/src/app/source/model-maps/app.component.ts +++ b/projects/nshmp-apps/src/app/source/model-maps/app.component.ts @@ -18,7 +18,7 @@ import {AboutComponent} from './components/about/about.component'; import {ControlPanelComponent} from './components/control-panel/control-panel.component'; import {InfoPopupComponent} from './components/info-popup/info-popup.component'; import {MapComponent} from './components/map/map.component'; -import {SettingsComponent} from './components/settings/settings.component'; +import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component'; import {AppService} from './services/app.service'; /** @@ -40,7 +40,7 @@ import {AppService} from './services/app.service'; NshmpLibNgAboutPageComponent, ControlPanelComponent, MapComponent, - SettingsComponent, + PlotSettingsPanelComponent, InfoPopupComponent, AboutComponent, AsyncPipe, diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.html rename to projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.scss b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.scss rename to projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.scss diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.spec.ts b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.spec.ts similarity index 60% rename from projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.spec.ts rename to projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.spec.ts index c88657d066321cbb9391901a2cccc0ff48e465d8..3222894851779a5e822da6c306b470021a276330 100644 --- a/projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.spec.ts +++ b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.spec.ts @@ -2,19 +2,19 @@ import {provideHttpClient} from '@angular/common/http'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {provideNoopAnimations} from '@angular/platform-browser/animations'; -import {SettingsComponent} from './settings.component'; +import {PlotSettingsPanelComponent} from './plot-settings-panel.component'; -describe('SettingsComponent', () => { - let component: SettingsComponent; - let fixture: ComponentFixture<SettingsComponent>; +describe('PlotSettingsPanelComponent', () => { + let component: PlotSettingsPanelComponent; + let fixture: ComponentFixture<PlotSettingsPanelComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [SettingsComponent], + imports: [PlotSettingsPanelComponent], providers: [provideHttpClient(), provideNoopAnimations()], }).compileComponents(); - fixture = TestBed.createComponent(SettingsComponent); + fixture = TestBed.createComponent(PlotSettingsPanelComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.ts b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.ts similarity index 74% rename from projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.ts rename to projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.ts index 35e8fa24228b9dc60fae165804b23b3ba1131566..a21d15fc6a7a91c6ffa042145a3718eb322db80b 100644 --- a/projects/nshmp-apps/src/app/source/model-maps/components/settings/settings.component.ts +++ b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.ts @@ -14,12 +14,12 @@ import {AppService} from '../../services/app.service'; AsyncPipe, ReactiveFormsModule, ], - selector: 'app-settings', + selector: 'app-plot-settings-panel', standalone: true, - styleUrl: './settings.component.scss', - templateUrl: './settings.component.html', + styleUrl: './plot-settings-panel.component.scss', + templateUrl: './plot-settings-panel.component.html', }) -export class SettingsComponent { +export class PlotSettingsPanelComponent { formGroup = this.service.formGroup; constructor(private service: AppService) {}