-
Notifications
You must be signed in to change notification settings - Fork 166
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
FluxTubes: some improvements in shapes and material #3993
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new images have no longer a transparent background. Was that on purpose? This will look strange when compared to the other images that are still transparent.
Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo
Show resolved
Hide resolved
Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderCircumferentialFlux.mo
Show resolved
Hide resolved
This reverts commit ea740a58823b9ce65f6b54d94a1208dfe7159f98.
@AHaumer I also had to revert your "???" commit once again here. Please follow the instruction I gave you of basing your future PRs on the current master (rather than keeping to merge the current master into your "broken" local master with that "???" commit). |
Sorry this was by mistake, I'll correct that. I suppose you mean the images for HollowCylinder RadialFlux and Axial Flux? |
Sorry I didn't get that. Where did you give these instructions (PM or in a PR)? I don't know how to fix my broken master (and I have no idea how it got broken). Thanks in advance @dietmarw ! |
I'm a little bit confused ... to me all images have a white background, also the older ones? |
1 similar comment
I'm a little bit confused ... to me all images have a white background, also the older ones? |
@AHaumer Have a look at the changed files here and scroll right to the bottom where GitHub shows you the changes to the images. As you can see the original had a checkered background (symbolising the transparency) the new ones have a plain white background which is not transparent. Dymola would only show you this if you started it in dark mode ( |
changed background of shapes images to transparent
@dietmarw sorry I didn't see that. Also two other images have white instead of transparent background - corrected all four. |
@AHaumer Simply checkout your local master and reset it to upstream master and then you can create your topic branches for future PRs based on that again.
(edited to also fetch the latest states of remote first) |
You still can add them to this repo and exclude them from packaging in the attributes files like done here: ModelicaStandardLibrary/.gitattributes Lines 40 to 42 in 569c525
See also #2603. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some of the materials are brand names of the manufacturer Vacuumschmelze. The manufacturer uses the UPPERCASE spelling but in Modelica we have all kinds of different spelling mixed: For the sake of simplicity I propose to keep the used record names in order to avoid changing the record name in the next major release by means of a conversion script. In this case we should at least use the manufacturer name in the label or at least unify the spelling of the labels.
In the following PNG images the angle alfa
shall be changed to either alpha
or the greek letter
- Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Circumferential.png
- Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Toroid.png
Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/Permenorm3601K3.mo
Outdated
Show resolved
Hide resolved
Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/PureIron/VacoferS2.mo
Outdated
Show resolved
Hide resolved
Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/Steel/Steel_9SMn28K.mo
Outdated
Show resolved
Hide resolved
Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/CobaltIron/Vacoflux50.mo
Outdated
Show resolved
Hide resolved
Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron/MuMetall.mo
Show resolved
Hide resolved
As this ticket includes a bug fix, too, it shall be back-ported to MSL 4.0.0. |
If that bugfix part is really important it should be isolated and not also mixed with all the extensions that this PR now contains. So question is, is it really such a severe bug (which one actually? Ticket?) or can we live with that until the next minor release. |
…ermenorm3601K3.mo Co-authored-by: Christian Kral <dr.christian.kral@gmail.com>
…oferS2.mo Co-authored-by: Christian Kral <dr.christian.kral@gmail.com>
…9SMn28K.mo Co-authored-by: Christian Kral <dr.christian.kral@gmail.com>
…acoflux50.mo Co-authored-by: Christian Kral <dr.christian.kral@gmail.com>
I just double-checked in detail: I'll replace "bug" by "improvement" in the title and the label of this PR. |
I've included the sources (Visio) for images. Thanks @beutlich for the hint about gitattributes. |
This is not yet resolved. |
Modelica/Magnetic/QuasiStatic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo
Outdated
Show resolved
Hide resolved
…rRadialFlux.mo to a separate PR
Modelica/Magnetic/FluxTubes/Shapes/FixedShape/HollowCylinderRadialFlux.mo
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK now
Checked all shapes, FluxTubes and QuasiStatic.FluxTubes in parallel