Refactor OneAxisTranslationControl
#1445
Merged
+203
−260
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
axelboc
commented
Oct 14, 2024
Comment on lines
-59
to
-94
| renderMotorSettings() { | ||
| return ( | ||
| <Popover title={<b>Sample alignment motors</b>}> | ||
| <div> | ||
| <MotorInput | ||
| save={this.props.save} | ||
| value={this.props.motors.sample_vertical.position} | ||
| saveStep={this.props.saveStep} | ||
| step={this.props.steps.sample_verticalStep} | ||
| motorName="sample_vertical" | ||
| label="Vertical" | ||
| suffix="mm" | ||
| decimalPoints="3" | ||
| state={this.props.motors.sample_vertical.state} | ||
| stop={this.props.stop} | ||
| disabled={this.props.motorsDisabled} | ||
| inplace | ||
| /> | ||
| <MotorInput | ||
| save={this.props.save} | ||
| value={this.props.motors.sample_horizontal.position} | ||
| saveStep={this.props.saveStep} | ||
| step={this.props.steps.sample_horizontalStep} | ||
| motorName="sample_horizontal" | ||
| label="Horizontal" | ||
| suffix="mm" | ||
| decimalPoints="3" | ||
| state={this.props.motors.sample_horizontal.state} | ||
| stop={this.props.stop} | ||
| disabled={this.props.motorsDisabled} | ||
| inplace | ||
| /> | ||
| </div> | ||
| </Popover> | ||
| ); | ||
| } |
There was a problem hiding this comment.
This was dead code — maybe from copy-pasting TwoAxisTranslationControl.
|
Thanks ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
OneAxisTranslationControlhas an input field that behaves the same way as the input field inMotorInput: you can type a number and press enter, or use up/down arrow to increment decrement, and it updates the value and shows the state of the underlying motor.So in this PR, I extract this shared input from
MotorInputinto aBaseMotorInputcomponent, and use it inOneAxisTranslationControl. This resolves a few minor inconsistencies between the two components and removes a bunch of duplicated code.Still more refactoring to go — notably, I'd like to reduce the number of props that are passed down to some of the components.