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

Draft: Fix annotation scale to label issue. #5048

Merged

Conversation

Roy-043
Copy link
Contributor

@Roy-043 Roy-043 commented Sep 20, 2021

The scale_to_label function did not handle scale 5:1, 10:1 or 20:1 properly.

Forum post: https://forum.freecadweb.org/viewtopic.php?f=23&t=60398

The cause of the problem:

>>> (1/20).as_integer_ratio()
(3602879701896397, 72057594037927936)
>>> (1/10).as_integer_ratio()
(3602879701896397, 36028797018963968)
>>> (1/5).as_integer_ratio()
(3602879701896397, 18014398509481984)

Thank you for creating a pull request to contribute to FreeCAD! To ease integration, we ask you to conform to the following items. Pull requests which don't satisfy all the items below might be rejected. If you are in doubt with any of the items below, don't hesitate to ask for help in the FreeCAD forum!

  • Your pull request is confined strictly to a single module. That is, all the files changed by your pull request are either in App, Base, Gui or one of the Mod subfolders. If you need to make changes in several locations, make several pull requests and wait for the first one to be merged before submitting the next ones
  • In case your pull request does more than just fixing small bugs, make sure you discussed your ideas with other developers on the FreeCAD forum
  • Your branch is rebased on latest master git pull --rebase upstream master
  • All FreeCAD unit tests are confirmed to pass by running ./bin/FreeCAD --run-test 0
  • All commit messages are well-written ex: Fixes typo in Draft Move command text
  • Your pull request is well written and has a good description, and its title starts with the module name, ex: Draft: Fixed typos
  • Commit messages include issue #<id> or fixes #<id> where <id> is the FreeCAD bug tracker issue number in case a particular commit solves or is related to an existing issue on the tracker. Ex: Draft: fix typos - fixes #0004805

And please remember to update the Wiki with the features added or changed once this PR is merged.
Note: If you don't have wiki access, then please mention your contribution on the 0.20 Changelog Forum Thread.


The scale_to_label function did not handle scale 5:1, 10:1 or 20:1 properly.
@chennes
Copy link
Member

chennes commented Sep 20, 2021

Good catch, thanks for the PR. Merging...

@chennes chennes merged commit e5d5bc7 into FreeCAD:master Sep 20, 2021
@Roy-043 Roy-043 deleted the Draft-Fix-annotation-scale-to-label-issue branch September 20, 2021 15:07
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.

None yet

2 participants