Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance Unit Conversion, rename _gal to _galUS, and add _galUK #1856

Open
wants to merge 10,000 commits into
base: master
Choose a base branch
from

Conversation

edwardtianye
Copy link

The default gallon is of US standard.
So I added UK standard as _galUK, and renamed _gal to _galUS.
And revised the toolbox tips accordingly.

GabrielNumworks and others added 30 commits November 4, 2020 15:58
Change-Id: I4a7f2e024ca82a3996ad3e395c8f62ca4170ec9e
Change-Id: I64a6500b66db4455217920a1e73efd5848216411
Renamed zoom button

Change-Id: I476c0991d5ab88c6642b793fbe10debbcca4e014
Change-Id: If3983c16d3bfa0de31aefe8a3f5c650e1858f822
Change-Id: Iaff562cca9af3eb903d6cc8a529c730184235e4b
Change-Id: I06d1850074b266a694d74e4db4c754ff156c8098
Change-Id: I7548d11fb114b2605ce34d3bda0776277b79ff9d
Change-Id: Icd65c4e19b78cd8751d6b1b583c112abb08c9237
Change-Id: If8904ca4e7d306376de785a125fe5fba168de718
Change-Id: I841bd22077cccacc7d2a4a541cca2e463f13925b
Change-Id: I834444aee7dd547c71254df4658c0db05eb101d7
Change-Id: If88f91d6e925dbb2ad293b537661eb3d137ea826
A previous fix to prevent AlphaLock from interfering with the long press
feature broke the long press selection. Revert the changes and find
another solution to the previous problem.
We compare the alpha status to both the state of the Alpha key and the
Lock, which makes sense : Lock is supposed to mimic Alpha being
continuously pressed.

Change-Id: I1349eb83f8971d3a5efcb10de020bb6c0aed64a1
Do not take strong variations into account if they would erase more
interesting variations.

Change-Id: I6299a64bed449a611f90eda4234af10a183958d1
Change-Id: Ia46966270418a339f8a37e8a1971a7f7dd046034
Change-Id: Ia28a7ffb826a9b6e3618b222b6ed9d0d43de308a
Added an event to represent the typing of text that is not on the
device's keyboard. ExternalText event's text is read from a buffer, that
will be filled when the event is generated.

ExternalText only exists on the simulator.

Change-Id: Ie78d2c7c2de91da986a1ce2130a5ecd123db48ee
Change-Id: I9683a8ba819b1a4aad18bcc4759160509e424d4e
Generate an ExternalText event when catching a SDL_TextInputEvent whose
text cannot be boiled down to one of the regular events.

Change-Id: I036fa2a153c8351979521d7f8cba6b62aa64604b
Change-Id: Id7f68f4dfb4727453a02437a0b824492a8c94730
The size of the ExternalText events shared buffer is now defined as the
size of the SDL_TextInputEvent 'text' field, as it should.
Also fix a wrong parameter being passed to a strlcpy.

Change-Id: I6a57d49d61fec8a009c4711efce564c65544e571
Change-Id: Iaef80fdbb6083be688fadc2b5fc515dbbd0d004c
Change-Id: I67c21d59263b7eddd7ee8ee9e61c168e6b013d13
Change-Id: I0d0d7dca0e167cfcb40f4b26d8208e12056ebf40
Change-Id: Ie2e028a5030e1b0d3f133efdde971645d5b4687b
Change-Id: Iaae5ee4292e33f923f47590ee4520bac44c5d750
Added some missing resets of the Auto and Normalize statuses

Change-Id: I5514a2566c1f6ba73d04b526402b428b2edce4b4
Only notify the delegate to the refresh the button when the status has
changed.

Change-Id: I6689d2c292ff96039a68cd1b437b18df5fb98829
@CLAassistant
Copy link

CLAassistant commented Jun 17, 2021

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
8 out of 11 committers have signed the CLA.

✅ GabrielNumworks
✅ HugoNumworks
✅ EmilieNumworks
✅ LeaNumworks
✅ thePeras
✅ M4xi1m3
✅ edwardtianye
✅ RedGl0w
❌ MartijnNumworks
❌ RobertaNumWorks
❌ Edward Tian


Edward Tian seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@github-actions
Copy link

.text .rodata .bss .data
Base 686 164 bytes 274 039 bytes 180 720 bytes 1 368 bytes
Head 686 140 bytes 274 327 bytes 180 720 bytes 1 376 bytes
- 24 bytes + 288 bytes + 0 bytes + 8 bytes
- 0.0 % + 0.1 % + 0.0 % + 0.6 %

@artaxxx
Copy link
Collaborator

artaxxx commented Jun 18, 2021

Thanks for your PR @edwardtianye ! Let me suggest some changes:

  • _gal should remain _gal and the legend "Gallon"
  • let's add _galUK with the legend "British gallon"
  • results or additional results should be given in _gal (not in _galUK), except if it's an explicit conversion: 1_L ⇾ _galUK for instance

@edwardtianye
Copy link
Author

Thanks for your prompt response, per to you suggestion, have the changes done.

@github-actions
Copy link

.text .rodata .bss .data
Base 686 164 bytes 274 039 bytes 180 720 bytes 1 368 bytes
Head 686 140 bytes 274 215 bytes 180 720 bytes 1 376 bytes
- 24 bytes + 176 bytes + 0 bytes + 8 bytes
- 0.0 % + 0.1 % + 0.0 % + 0.6 %

@edwardtianye
Copy link
Author

Sorry, should make a PR on version-15 branch?

Copy link
Contributor

@GabrielNumworks GabrielNumworks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR !
I tested it and found that _galUK appears in results instead of _gal. To fix that, you'd need to change the number of authorized volume representative in simplification. This is done in poincare/src/unit.cpp, in the definition of VolumeRepresentative::standardRepresentative : the fourth argument of the call to DefaultFindBestRepresentative needs to be changed from numberOfRepresentatives() - 1 to numberOfRepresentatives() - 2.
Appart from that and the small style comments, this is good for me !

@@ -91,6 +91,7 @@ UnitVolumeCup = "Cup"
UnitVolumePint = "Pint"
UnitVolumeQuart = "Quart"
UnitVolumeGallon = "Gallon"
UnitVolumeGallonUk = "Gallon(UK)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you change this to "British gallon" instead ? Same in the other languages.

@@ -414,7 +414,7 @@ class UnitNode final : public ExpressionNode {
public:
constexpr static VolumeRepresentative Default() { return VolumeRepresentative(nullptr, 0., Prefixable::None, Prefixable::None); }
const Vector<int> dimensionVector() const override { return Vector<int>{.time = 0, .distance = 3, .mass = 0, .current = 0, .temperature = 0, .amountOfSubstance = 0, .luminuousIntensity = 0}; }
int numberOfRepresentatives() const override { return 8; }
int numberOfRepresentatives() const override { return 9; } // Edward modified from 8 to 9 for obtaining galUK
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove this comment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.