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.

Sign up for GitHub

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

Jump to bottom

Fix figures location for Fluid #3322

Merged
merged 17 commits into from
Jan 21, 2020
Merged

Fix figures location for Fluid #3322

merged 17 commits into from
Jan 21, 2020

Conversation

tobolar
Copy link
Contributor

@tobolar tobolar commented Jan 15, 2020

refs #2695

tobolar and others added 17 commits October 21, 2019 16:00
@tobolar
Merge pull request #1 from modelica/master
0ac715c 
Merge master
@tobolar
Merge pull request #2 from modelica/master
47bc561 
Merge master
@tobolar
Merge pull request #3 from modelica/master
32bf782 
Merge master
@tobolar
Merge pull request #4 from modelica/master
e76bb0f 
Marge master
@tobolar
Merge pull request #5 from modelica/master
fa8278b 
Merge master
@tobolar
Merge pull request #6 from modelica/master
8557dc1 
Fix broken html tags <em> and <code> (#3270)
@tobolar
Merge pull request #7 from modelica/master
a4e34aa 
Marge master
@tobolar
Merge pull request #8 from modelica/master
a9569ba 
Marge master
@tobolar
Merge pull request #9 from modelica/master
15f9ee7 
Marge master
@tobolar
Relocate PNG file(s) for Fluid.Examples
b276ad2
@tobolar
Relocate PNG file(s) for Fluid.Pipes
e7ef47a
@tobolar
Relocate PNG file(s) for Fluid.Valves
bb349ec
@tobolar
Relocate PNG file(s) for Fluid.Dissipation.utilities.SharedDocumentation
8e83ea0
@tobolar
Relocate PNG file(s) for Fluid.Dissipation
1fbe0b3
@tobolar
Relocate PNG file(s) for Fluid.Utilities
aa21a1b
@tobolar
Rename directory Utilities (Camel Case)
1a7c54c 
(In Modelica/Resources/Images/Fluid/Dissipation)
@tobolar
Rename directory PressureLoss/StraightPipe (Camel Case)
5621883 
(in Modelica\Resources\Images\Fluid\Dissipation)
@tobolar tobolar added documentation Issue addresses the documentation L: Fluid Issue addresses Modelica.Fluid (excl. Dissipation) L: Fluid.Dissipation Issue addresses Modelica.Fluid.Dissipation labels Jan 15, 2020
@tobolar tobolar added this to the MSL4.0.0 milestone Jan 15, 2020
@beutlich beutlich self-assigned this Jan 16, 2020
@beutlich beutlich added the L: Resources Issue addresses Modelica/Resources (excl. C-Sources) label Jan 16, 2020
beutlich
beutlich reviewed Jan 16, 2020
View reviewed changes
Copy link
Member

@beutlich beutlich left a comment

Choose a reason for hiding this comment

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

Should Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/ be renamed to Modelica/Resources/Images/Fluid/Dissipation/HeatTransfer/ (and similar for all other occurrences)?

casella
casella reviewed Jan 17, 2020
View reviewed changes
Copy link
Contributor

@casella casella left a comment

Choose a reason for hiding this comment

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

Did you check with at least one tool that everything shows up correctly? If so, I'm fine with this PR

@tobolar
Copy link
Contributor Author

tobolar commented Jan 17, 2020 •
edited

@beutlich

Should Modelica/Resources/Images/Fluid/Dissipation/heatTransfer/ be renamed to Modelica/Resources/Images/Fluid/Dissipation/HeatTransfer/ (and similar for all other occurrences)?

Yes and no. This PR concerns only PNG files used in the class documentation. But the images in "heatTransfer" directory are used only in icons. So yes, it should be renamed, and no, not in this PR (IMO).
Actually, there are far more images left in the directories of Fluid which aren't used anyway, see #3339.

@tobolar
Copy link
Contributor Author

tobolar commented Jan 17, 2020

@casella

Did you check with at least one tool that everything shows up correctly?

I have tried it. And have also checked that all images used in the documentation exist in the /Modelica/Resources/Images/Fluid directory.

@tobolar tobolar mentioned this pull request Jan 20, 2020
Closed
dietmarw
dietmarw approved these changes Jan 21, 2020
View reviewed changes
Copy link
Member

@dietmarw dietmarw left a comment

Choose a reason for hiding this comment

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

Checked with OM document generator. Seems fine.

@beutlich beutlich removed the request for review from christiankral January 21, 2020 15:32
@beutlich beutlich merged commit a3fd714 into modelica:master Jan 21, 2020
@tobolar tobolar deleted the fixFiguresLocationFluid branch January 23, 2020 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@beutlich beutlich beutlich left review comments

@dietmarw dietmarw dietmarw approved these changes

@casella casella casella approved these changes

Assignees

@beutlich beutlich

Labels
documentation Issue addresses the documentation L: Fluid.Dissipation Issue addresses Modelica.Fluid.Dissipation L: Fluid Issue addresses Modelica.Fluid (excl. Dissipation) L: Resources Issue addresses Modelica/Resources (excl. C-Sources)
Projects
None yet
Milestone
MSL4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tobolar @dietmarw @casella @beutlich