chore: rename 'slowdown' to 'decelerate'

nvsukhanov · Apr 7, 2024 · 90c5aa9 · 90c5aa9
1 parent 5a05907
commit 90c5aa9
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 33 deletions.
diff --git a/modules/bindings/src/lib/accelerate/accelerate-binding-edit.component.html b/modules/bindings/src/lib/accelerate/accelerate-binding-edit.component.html
@@ -20,7 +20,7 @@
         >
             <lib-cs-binding-control-select-controller [data]="forwardsControlBindingComponentData"></lib-cs-binding-control-select-controller>
             <lib-cs-binding-control-select-controller [data]="backwardsControlBindingComponentData"></lib-cs-binding-control-select-controller>
-            <lib-cs-binding-control-select-controller [data]="slowdownControlBindingComponentData"></lib-cs-binding-control-select-controller>
+            <lib-cs-binding-control-select-controller [data]="decelerateControlBindingComponentData"></lib-cs-binding-control-select-controller>
 
             <mat-error [libValidationMessages]="form.controls.inputs"
                        [immediatelyShowMessages]="true"
@@ -49,9 +49,9 @@
                 ></lib-cs-binding-control-speed-input>
             }
 
-            @if (isSlowDownControlAssigned) {
-                <lib-cs-binding-control-speed-input [control]="form.controls.slowdownSpeedDecrement"
-                                                    [translocoTitle]="'controlScheme.accelerateBinding.slowdownSpeedDecrement'"
+            @if (isDecelerateControlAssigned) {
+                <lib-cs-binding-control-speed-input [control]="form.controls.decelerateSpeedDecrement"
+                                                    [translocoTitle]="'controlScheme.accelerateBinding.decelerateSpeedDecrement'"
                 ></lib-cs-binding-control-speed-input>
             }
 

diff --git a/modules/bindings/src/lib/accelerate/accelerate-binding-edit.component.ts b/modules/bindings/src/lib/accelerate/accelerate-binding-edit.component.ts
@@ -56,7 +56,7 @@ export class AccelerateBindingEditComponent implements IBindingsDetailsEditCompo
 
     private _backwardsControlBindingComponentData: BindingControlSelectControllerComponentData<ControlSchemeBindingType.Speed> | null = null;
 
-    private _slowdownControlBindingComponentData: BindingControlSelectControllerComponentData<ControlSchemeBindingType.Speed> | null = null;
+    private _decelerateControlBindingComponentData: BindingControlSelectControllerComponentData<ControlSchemeBindingType.Speed> | null = null;
 
     constructor(
         private readonly cd: ChangeDetectorRef,
@@ -72,8 +72,8 @@ export class AccelerateBindingEditComponent implements IBindingsDetailsEditCompo
         return this._backwardsControlBindingComponentData;
     }
 
-    public get slowdownControlBindingComponentData(): BindingControlSelectControllerComponentData<ControlSchemeBindingType.Speed> | null {
-        return this._slowdownControlBindingComponentData;
+    public get decelerateControlBindingComponentData(): BindingControlSelectControllerComponentData<ControlSchemeBindingType.Speed> | null {
+        return this._decelerateControlBindingComponentData;
     }
 
     public get isForwardsControlAssigned(): boolean {
@@ -84,7 +84,7 @@ export class AccelerateBindingEditComponent implements IBindingsDetailsEditCompo
         return !!this.form?.controls.inputs.controls[SpeedBindingInputAction.Backwards].controls.controllerId.value;
     }
 
-    public get isSlowDownControlAssigned(): boolean {
+    public get isDecelerateControlAssigned(): boolean {
         return !!this.form?.controls.inputs.controls[SpeedBindingInputAction.Brake].controls.controllerId.value;
     }
 
@@ -93,7 +93,7 @@ export class AccelerateBindingEditComponent implements IBindingsDetailsEditCompo
     ): void {
         const forwardsControls = outputBinding.controls.inputs.controls[SpeedBindingInputAction.Forwards].controls;
         const backwardsControls = outputBinding.controls.inputs.controls[SpeedBindingInputAction.Backwards].controls;
-        const slowdownControls = outputBinding.controls.inputs.controls[SpeedBindingInputAction.Brake].controls;
+        const decelerateControls = outputBinding.controls.inputs.controls[SpeedBindingInputAction.Brake].controls;
         if (outputBinding !== this.form) {
             this.form = outputBinding;
 
@@ -111,11 +111,11 @@ export class AccelerateBindingEditComponent implements IBindingsDetailsEditCompo
                 inputName$: this.l10nService.getBindingInputName(AccelerateBindingInputAction.Backwards),
                 supportedInputPipes: [ InputPipeType.Pulse ]
             };
-            this._slowdownControlBindingComponentData = {
+            this._decelerateControlBindingComponentData = {
                 bindingType: ControlSchemeBindingType.Speed,
-                inputFormGroup: outputBinding.controls.inputs.controls[AccelerateBindingInputAction.Slowdown],
+                inputFormGroup: outputBinding.controls.inputs.controls[AccelerateBindingInputAction.Decelerate],
                 inputAction: SpeedBindingInputAction.Brake,
-                inputName$: this.l10nService.getBindingInputName(AccelerateBindingInputAction.Slowdown),
+                inputName$: this.l10nService.getBindingInputName(AccelerateBindingInputAction.Decelerate),
                 supportedInputPipes: [ InputPipeType.Pulse ]
             };
 
@@ -126,9 +126,9 @@ export class AccelerateBindingEditComponent implements IBindingsDetailsEditCompo
                 backwardsControls.controllerId.valueChanges,
                 backwardsControls.inputId.valueChanges,
                 backwardsControls.inputType.valueChanges,
-                slowdownControls.controllerId.valueChanges,
-                slowdownControls.inputId.valueChanges,
-                slowdownControls.inputType.valueChanges
+                decelerateControls.controllerId.valueChanges,
+                decelerateControls.inputId.valueChanges,
+                decelerateControls.inputType.valueChanges
             ).subscribe(() => {
                 this.cd.markForCheck();
             });

diff --git a/modules/bindings/src/lib/accelerate/accelerate-binding-form-builder.service.ts b/modules/bindings/src/lib/accelerate/accelerate-binding-form-builder.service.ts
@@ -39,7 +39,7 @@ export class AccelerateBindingFormBuilderService implements IBindingFormBuilder<
                 this.appConfig.acceleration.defaultAccelerationStep,
                 this.minSpeedIncrement
             ),
-            slowdownSpeedDecrement: this.commonFormControlBuilder.speedControl(
+            decelerateSpeedDecrement: this.commonFormControlBuilder.speedControl(
                 this.appConfig.acceleration.defaultAccelerationStep,
                 this.minSpeedIncrement
             ),

diff --git a/modules/bindings/src/lib/accelerate/accelerate-binding-form-mapper.service.ts b/modules/bindings/src/lib/accelerate/accelerate-binding-form-mapper.service.ts
@@ -28,7 +28,7 @@ export class AccelerateBindingFormMapperService implements IBindingFormMapper<Ac
             inputs: {},
             forwardsSpeedIncrement: form.controls.forwardsSpeedIncrement.getRawValue(),
             backwardsSpeedIncrement: form.controls.backwardsSpeedIncrement.getRawValue(),
-            slowdownSpeedDecrement: form.controls.slowdownSpeedDecrement.getRawValue(),
+            decelerateSpeedDecrement: form.controls.decelerateSpeedDecrement.getRawValue(),
             hubId,
             portId,
             maxSpeed: form.controls.maxSpeed.getRawValue(),

diff --git a/modules/bindings/src/lib/accelerate/accelerate-binding-form.ts b/modules/bindings/src/lib/accelerate/accelerate-binding-form.ts
@@ -11,7 +11,7 @@ export type AccelerateBindingForm = FormGroup<{
     }>;
     forwardsSpeedIncrement: FormControl<number>;
     backwardsSpeedIncrement: FormControl<number>;
-    slowdownSpeedDecrement: FormControl<number>;
+    decelerateSpeedDecrement: FormControl<number>;
     hubId: FormControl<string | null>;
     portId: FormControl<number | null>;
     maxSpeed: FormControl<number>;

diff --git a/modules/bindings/src/lib/accelerate/accelerate-binding-input-extractor.service.ts b/modules/bindings/src/lib/accelerate/accelerate-binding-input-extractor.service.ts
@@ -45,7 +45,7 @@ export class AccelerateBindingInputExtractorService implements ITasksInputExtrac
             binding,
             globalInput$,
             controllersSettings$,
-            binding.inputs[AccelerateBindingInputAction.Slowdown]
+            binding.inputs[AccelerateBindingInputAction.Decelerate]
         ).pipe(
             distinctUntilIsActivatedChanged()
         );
@@ -54,7 +54,7 @@ export class AccelerateBindingInputExtractorService implements ITasksInputExtrac
             map(([forwards, backwards, brake]) => ({
                 [AccelerateBindingInputAction.Forwards]: forwards,
                 [AccelerateBindingInputAction.Backwards]: backwards,
-                [AccelerateBindingInputAction.Slowdown]: brake
+                [AccelerateBindingInputAction.Decelerate]: brake
             }))
         );
     }

diff --git a/modules/bindings/src/lib/accelerate/accelerate-binding-l10n.service.ts b/modules/bindings/src/lib/accelerate/accelerate-binding-l10n.service.ts
@@ -25,8 +25,8 @@ export class AccelerateBindingL10nService implements IBindingL10n<ControlSchemeB
                 return this.translocoService.selectTranslate('controlScheme.accelerateBinding.forwardsInput');
             case AccelerateBindingInputAction.Backwards:
                 return this.translocoService.selectTranslate('controlScheme.accelerateBinding.backwardsInput');
-            case AccelerateBindingInputAction.Slowdown:
-                return this.translocoService.selectTranslate('controlScheme.accelerateBinding.slowdownInput');
+            case AccelerateBindingInputAction.Decelerate:
+                return this.translocoService.selectTranslate('controlScheme.accelerateBinding.decelerateInput');
         }
     }
 
@@ -37,7 +37,7 @@ export class AccelerateBindingL10nService implements IBindingL10n<ControlSchemeB
         switch (actionType) {
             case AccelerateBindingInputAction.Forwards:
             case AccelerateBindingInputAction.Backwards:
-            case AccelerateBindingInputAction.Slowdown:
+            case AccelerateBindingInputAction.Decelerate:
                 return this.controllerInputNameService.getFullControllerInputNameData(inputConfig);
         }
     }

diff --git a/modules/bindings/src/lib/accelerate/accelerate-binding-task-payload-builder.service.ts b/modules/bindings/src/lib/accelerate/accelerate-binding-task-payload-builder.service.ts
@@ -25,7 +25,7 @@ export class AccelerateBindingTaskPayloadBuilderService implements ITaskPayloadB
     ): { payload: SpeedTaskPayload; inputTimestamp: number } | null {
         const forwardsInput = this.getActiveInput(binding, currentInput, previousInput, AccelerateBindingInputAction.Forwards);
         const backwardsInput = this.getActiveInput(binding, currentInput, previousInput, AccelerateBindingInputAction.Backwards);
-        const brakeInput = this.getActiveInput(binding, currentInput, previousInput, AccelerateBindingInputAction.Slowdown);
+        const brakeInput = this.getActiveInput(binding, currentInput, previousInput, AccelerateBindingInputAction.Decelerate);
 
         const previousSpeed = previousTask?.payload.type === TaskType.Speed ? previousTask.payload.speed : 0;
 
@@ -52,7 +52,7 @@ export class AccelerateBindingTaskPayloadBuilderService implements ITaskPayloadB
         if (brakeInput.isActivated) {
             const previousBrakeFactor = previousTask?.payload.type === TaskType.Speed ? previousTask.payload.brakeFactor : 0;
 
-            if ((Math.abs(previousSpeed) - previousBrakeFactor) <= binding.slowdownSpeedDecrement) {
+            if ((Math.abs(previousSpeed) - previousBrakeFactor) <= binding.decelerateSpeedDecrement) {
                 const payload = {
                     type: TaskType.Speed,
                     speed: 0,
@@ -65,7 +65,7 @@ export class AccelerateBindingTaskPayloadBuilderService implements ITaskPayloadB
                 return { payload, inputTimestamp: brakeInput.timestamp };
             }
             if (previousSpeed !== 0 && previousBrakeFactor !== previousSpeed) {
-                const nextSpeed = previousSpeed - Math.sign(previousSpeed) * binding.slowdownSpeedDecrement;
+                const nextSpeed = previousSpeed - Math.sign(previousSpeed) * binding.decelerateSpeedDecrement;
 
                 return {
                     payload: this.buildTaskPayload(nextSpeed, binding, previousTask),

diff --git a/modules/store/src/lib/models/control-scheme.model.ts b/modules/store/src/lib/models/control-scheme.model.ts
@@ -196,7 +196,7 @@ export type ControlSchemeGearboxBinding = {
 export enum AccelerateBindingInputAction {
     Forwards = '0',
     Backwards = '1',
-    Slowdown = '2'
+    Decelerate = '2'
 }
 
 export type ControlSchemeAccelerateBinding = {
@@ -205,11 +205,11 @@ export type ControlSchemeAccelerateBinding = {
     inputs: {
         [AccelerateBindingInputAction.Forwards]?: ControlSchemeInputConfig;
         [AccelerateBindingInputAction.Backwards]?: ControlSchemeInputConfig;
-        [AccelerateBindingInputAction.Slowdown]?: ControlSchemeInputConfig;
+        [AccelerateBindingInputAction.Decelerate]?: ControlSchemeInputConfig;
     };
     forwardsSpeedIncrement: number;
     backwardsSpeedIncrement: number;
-    slowdownSpeedDecrement: number;
+    decelerateSpeedDecrement: number;
     hubId: string;
     portId: number;
     maxSpeed: number;

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -361,12 +361,12 @@
       "operationMode": "Accelerate",
       "forwardsInput": "Forwards",
       "backwardsInput": "Backwards",
-      "slowdownInput": "Slowdown",
+      "decelerateInput": "Decelerate",
       "missingInputs": "At least one of the inputs must be assigned",
       "outputSpeed": "Max speed",
       "forwardsSpeedIncrement": "Forwards speed increment",
       "backwardsSpeedIncrement": "Backwards speed increment",
-      "slowdownSpeedDecrement": "Slowdown increment"
+      "decelerateSpeedDecrement": "Deceleration increment"
     },
     "widgets": {
       "reorderWidgetsButtonTitle": "Reorder widgets",

diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json
@@ -361,12 +361,12 @@
       "operationMode": "Ускорение",
       "forwardsInput": "Вперед",
       "backwardsInput": "Назад",
-      "slowdownInput": "Замедление",
+      "decelerateInput": "Замедление",
       "missingInputs": "Нужно назначить хотя-бы один контроллер",
       "outputSpeed": "Макс. скорость",
       "forwardsSpeedIncrement": "Шаг ускорения вперед",
       "backwardsSpeedIncrement": "Шаг ускорения назад",
-      "slowdownSpeedDecrement": "Шаг замедления"
+      "decelerateSpeedDecrement": "Шаг замедления"
     },
     "widgets": {
       "reorderWidgetsButtonTitle": "Изменить порядок виджетов",