Voltage colors #3412
Voltage colors #3412
Conversation
…into per-motor
…r-motor # Conflicts: # src/software/thunderscope/robot_diagnostics/drive_and_dribbler_widget.py
…ge-colors � Conflicts: � src/software/thunderscope/robot_diagnostics/drive_and_dribbler_widget.py
Muxite
requested review from
itsarune,
williamckha and
sauravbanna
as code owners
| @@ -147,23 +148,34 @@ def setValue(self, value: float) -> None: | |||
| """ | |||
| super(ColorProgressBar, self).setValue(int(value * self.decimals)) | |||
|
|
|||
| # clamp percent to make sure it's between 0% and 100% | |||
| percent = self.getPercentage() | |||
| def sigmoid_interpolate(val, x1, y1, x2, y2): | |||
There was a problem hiding this comment.
you could use this function from C++ for this:
you would need to pybind it via python_bindings.cpp https://github.com/UBC-Thunderbots/Software/blob/81ec0830e11d0a53002aa517a2cc190de75a9721/src/software/python_bindings.cpp
The advantage of doing this is that the C++ one is unit tested while this one isn't (also less code duplication)
| percent = self.getPercentage() | ||
| if 0 < percent < 0.5: | ||
| r = 200 | ||
| g = sigmoid_interpolate(percent, 0, 0, 0.5, 200) | ||
| elif percent < 0: | ||
| r = 200 | ||
| g = 0 | ||
| else: | ||
| super(ColorProgressBar, self).setStyleSheet( | ||
| "QProgressBar::chunk" | ||
| "{" | ||
| f"background: rgb({255 * 2 * (1 - percent)}, 255, 0)" | ||
| "}" | ||
| ) | ||
| r = sigmoid_interpolate(percent, 0.5, 200, 1, 0) | ||
| g = 200 |
There was a problem hiding this comment.
Muk, I think I can handle the implementation for this. I'll get to it either tonight or tomorrow, and it should also use the cpp sigmoid interpolate, so I'll be killing two birds with one stone. I'll shoot you a text when I finish the implementation so you can use it.
There was a problem hiding this comment.
Ok if my pr gets merged you can use the function called color_from_gradient to achieve the same thing.
The way it works is you define threshold values for each gradient stop point, and then define the rgb values for each one of those stop points. If you want to make a hard change like in my pr then you list the stop point twice. See my pr.
Update to utilize color_from_gradient
|
You need to change the dependencies in the BUILD file to include util.py, so that your CL tests pass. |
|
This PR is stale because it has been open for 30 days with no activity. Remove stale label or comment or this will be closed in 5 days. |
|
@GrayHoang can you pull master into this branch and you should be good to merge |
|
It's not my pr lol |
Oh whoops. The email notification showed me your last comment. @Muxite |
Description
Color of battery indicator in thunderscope diagnostics has been changed to a gradient from red to yellow to green. Red is at the minimum voltage and below, yellow at the center, and green at max voltage or above. Fixed the self.percentage variable, as the method was using int, causing the number to be 0 or 1 instead of a float.
Testing Done
Testing was done by connecting to a robot in the mezz, and changing out the batteries. Continued testing by plugging in different percentage values to cause color changes.
Resolved Issues
#3395
Length Justification and Key Files to Review
common_widgets.py
Review Checklist
.hfile) should have a javadoc style comment at the start of them. For examples, see the functions defined inthunderbots/software/geom. Similarly, all classes should have an associated Javadoc comment explaining the purpose of the class.TODO(or similar) statements should either be completed or associated with a github issue