diff --git a/src/app/components/calculator-list/calculator-list.component.html b/src/app/components/calculator-list/calculator-list.component.html index e8b083588ce1145dfe2ffc0e37f736a02a5908ac..4f0a6c03e792ad157f77af1feb006a64156e6e41 100644 --- a/src/app/components/calculator-list/calculator-list.component.html +++ b/src/app/components/calculator-list/calculator-list.component.html @@ -8,7 +8,7 @@ <mat-card-subtitle>{{ theme.description }}</mat-card-subtitle> </mat-card-header> - <!-- <img mat-card-image src="http://maurice.rolland.pagesperso-orange.fr/barduser01.jpg"> --> + <img mat-card-image [src]="theme.image"> <!-- <mat-card-content> <p>{{ theme.description }}</p> diff --git a/src/app/components/calculator-list/calculator-list.component.ts b/src/app/components/calculator-list/calculator-list.component.ts index 2af92fe5f19110d66eb6e3334be391d0722e34cf..1691ce2de4b43bedd6712a6ec33f79864f2523a0 100644 --- a/src/app/components/calculator-list/calculator-list.component.ts +++ b/src/app/components/calculator-list/calculator-list.component.ts @@ -37,6 +37,7 @@ export class CalculatorListComponent implements OnInit { const item = { title: ServiceFactory.instance.i18nService.localizeText(themeTitleKey), description: ServiceFactory.instance.i18nService.localizeText(themeDescriptionKey), + image: "assets/images/" + theme.image, calculators: [] }; // get calculators for this theme diff --git a/src/app/config.example.json b/src/app/config.example.json index 71535b5dc28833296daf2550832091bdc6cdac6c..34bf1ed82cf132a420bfc798d820161310533b9a 100644 --- a/src/app/config.example.json +++ b/src/app/config.example.json @@ -1,29 +1,34 @@ { "params": { - "displayPrecision": 0.002, - "computePrecision": 0.0002, - "newtonMaxIterations": 52, + "displayPrecision": 0.001, + "computePrecision": 0.0001, + "newtonMaxIterations": 50, "language": "fr" }, "themes": [ { "name": "PASSE_A_BASSIN", + "image": "passe-bassin.jpg", "calculators": [ 5, 6, 10, 9 ] }, { "name": "PASSE_NATURELLE", + "image": "passe-naturelle.jpg", "calculators": [ ] }, { "name": "HYDRAULIQUE_A_SURFACE_LIBRE", + "image": "surface-libre.jpg", "calculators": [ 2, 3, 4 ] }, { "name": "HYDRAULIQUE_EN_CHARGE", + "image": "en-charge.jpg", "calculators": [ 1, 0 ] }, { "name": "LOIS_D_OUVRAGES", + "image": "ouvrages.jpg", "calculators": [ 8, 9, 10 ] } ] diff --git a/src/assets/images/en-charge.jpg b/src/assets/images/en-charge.jpg new file mode 100644 index 0000000000000000000000000000000000000000..38d2e2204322966fb5527f030d23c6eeeba98863 Binary files /dev/null and b/src/assets/images/en-charge.jpg differ diff --git a/src/assets/images/ouvrages.jpg b/src/assets/images/ouvrages.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4b69e471a0baec2dc5eb5aed228699e2fa7da884 Binary files /dev/null and b/src/assets/images/ouvrages.jpg differ diff --git a/src/assets/images/passe-bassin.jpg b/src/assets/images/passe-bassin.jpg new file mode 100644 index 0000000000000000000000000000000000000000..26353351214831635948037bd81ca7999d3bdea1 Binary files /dev/null and b/src/assets/images/passe-bassin.jpg differ diff --git a/src/assets/images/passe-naturelle.jpg b/src/assets/images/passe-naturelle.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0e35afe735f45d82bed1988cb9b7589e117290d8 Binary files /dev/null and b/src/assets/images/passe-naturelle.jpg differ diff --git a/src/assets/images/surface-libre.jpg b/src/assets/images/surface-libre.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a1876b21caa2f4570d0b8af4b8bea7513aa139df Binary files /dev/null and b/src/assets/images/surface-libre.jpg differ