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

Removed obsolete images from Resources/Fluid #3429

Merged
merged 2 commits into from
Feb 19, 2020

Conversation

wischhusen
Copy link
Contributor

@wischhusen wischhusen commented Feb 17, 2020

Ref: #3339 Please merge

@dietmarw
Copy link
Member

Sorry but this is a total mess. What is it you actually wanted to achieve here?

If you have a look what this PR touches (https://github.com/modelica/ModelicaStandardLibrary/pull/3429/files) then you will understand that this does not work.

@wischhusen
Copy link
Contributor Author

I see. Well only the last three commits are relevant.

@dietmarw
Copy link
Member

OK let me see what I can do.

@wischhusen
Copy link
Contributor Author

Thanks

@dietmarw dietmarw changed the title #3339 Removed obsolete images from Resources/Fluid Removed obsolete images from Resources/Fluid Feb 17, 2020
@dietmarw
Copy link
Member

@wischhusen I need some more info since you based your changes on a way outdated master. For the future, before doing any changes make sure that your master branch is up to date with what is in the main repository.

So can you please comment on what you have done. As in did you only remove files or did you also update some references in some Modelica files?

@wischhusen
Copy link
Contributor Author

I would be highly interested in a fool-proof step-by-step procedure ;-). I carried out Git Sync on my fork but that was obviously not enough.

The changes have almost nothing to do with the Modelica code. I just removed png and eps files from the Resources folder as explained in #3339. And I removed a link to FD.png in the documentation of Dissipation package (top-level docu). This is the only change in the Modelica library that is relevant.

@dietmarw
Copy link
Member

There are quite a lot of images that were missed it seems. So I'm going to do a different approach of removing first ALL images and then see what the OM document generator complains is missing.

@dietmarw
Copy link
Member

dietmarw commented Feb 18, 2020

So I've redone the removal. I can automatically check for images used in the documentation since the OM documentation generator complains about missing files. But for image files used as icons I could only check manually. So it would be good if @wischhusen could have a look especially at the icons to see if something is missing now or not.

@dietmarw dietmarw self-assigned this Feb 18, 2020
@dietmarw dietmarw added documentation Issue addresses the documentation L: Fluid.Dissipation Issue addresses Modelica.Fluid.Dissipation labels Feb 18, 2020
@dietmarw dietmarw added this to the MSL4.0.0 milestone Feb 18, 2020
@dietmarw dietmarw mentioned this pull request Feb 18, 2020
Copy link
Contributor

@tobolar tobolar left a comment

Choose a reason for hiding this comment

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

I haven't found any image being missing in the documentation of MSL.
But still: Fluid/Components/Tank_PipeAboveTankLevel.png is not used elsewhere.

Both Images/Fluid/Dissipation/heatTransfer and Images/Fluid/Dissipation/pressureLoss seem to be clean now.

@dietmarw
Copy link
Member

Good catch. I removed that one now too.

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.

Looks good

@casella casella merged commit 3150a71 into modelica:master Feb 19, 2020
@beutlich beutlich added the L: Resources Issue addresses Modelica/Resources (excl. C-Sources) label Feb 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Issue addresses the documentation L: Fluid.Dissipation Issue addresses Modelica.Fluid.Dissipation L: Resources Issue addresses Modelica/Resources (excl. C-Sources)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants