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

Svg images created #21 #23

Merged
merged 12 commits into from
Nov 6, 2020
Merged

Conversation

pandeysudan27
Copy link
Contributor

Some svg images were created. The color code of water and air is taken lighter so that latex text can be seen easily. Otherwise its an extra job to create a background image for the latex text, probably white; I am afraid, the whole figure looks ugly. (It looks like ghosts.png was never used) . May be we need to check unused images. (@dietmarw Do you have any short method to check if all the images where used in the OpenHPL).

Copy link
Collaborator

@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.

A couple of things.

  • The penstock.png still needs to be converted
  • I understand the issue with the colour but then we should agree on some standard colour code: My proposal is RGB={20,220,220} and then also the connector colours should be adapted.
  • keep air colour green
  • Some of the images have offset of fill colour and boundary e.g., STSimple.svg but check others too.
  • When changing from png to svg also the references in the modelica code need to be updated and proper width needs to be set in addition. E.g., width="800"
    Currently these png are still linked:
~/.workspace/OpenHPL/OpenHPL[Svgimages]$ grep -r "\\.png"
Binary file Resources/Documents/Report.docx matches
Waterway/PenstockKP.mo:<p><img src=\"modelica://OpenHPL/Resources/Images/penstock.png\" style=\"width:50%\"></p>
Waterway/BendPipe.mo:<p><img src=\"modelica://OpenHPL/Resources/Images/MinorLoss.png\"/></p>
Waterway/Pipe.mo:    <p align=\"center\"><img src=\"modelica://OpenHPL/Resources/Images/pipe.png\"> </p>
Waterway/Penstock.mo:<p><img src=\"modelica://OpenHPL/Resources/Images/penstock.png\"></p>
Waterway/Penstock.mo:<p><img src=\"modelica://OpenHPL/Resources/Images/besad.png\"></p>
Functions/KP07/KPfunctions/GhostCells.mo:<p><img src=\"modelica://OpenHPL/Resources/Images/ghosts.png\"/></p>
Functions/DarcyFriction/fDarcy.mo:<p><img src=\"modelica://OpenHPL/Resources/Images/darcyf.png\"/></p>
Functions/DarcyFriction/fDarcy.mo:<p><img src=\"modelica://OpenHPL/Resources/Images/darcyf_zoomed.png\"/></p>
ElectroMech/Turbines/Turbine.mo:<img src=\"modelica://OpenHPL/Resources/Images/turbinepic.png\">
ElectroMech/Generators/SimpleGen.mo:<img src=\"modelica://OpenHPL/Resources/Images/simplegen.png\">
ElectroMech/Generators/SimpleGen2.mo:<img src=\"modelica://OpenHPL/Resources/Images/simplegen.png\">

@dietmarw
Copy link
Collaborator

One more:

  • kp.svg contains some additional arrows outside the view box. That needs to be removed.

@pandeysudan27
Copy link
Contributor Author

I got the way to fix the arrow for denoting flow like Vdot, velocity-v, etc. in STSimple and others. I made changes in gitkraken, thanks for the video. Is it possible to work with Lyx rather than Latex for Userguide; I have a very slow workflow with Latex?

@dietmarw
Copy link
Collaborator

No please no Lyx.

@pandeysudan27
Copy link
Contributor Author

OK.

@dietmarw
Copy link
Collaborator

dietmarw commented Sep 9, 2020

@pandeysudan27 Did you have any chance on working further on this PR fixing the issues I mentioned above?

@dietmarw
Copy link
Collaborator

dietmarw commented Sep 11, 2020

I've now replaced all png files except besad.png. Other things left:

  • common colour for water: It should be the same as in the connectors: {0,128,255}
  • air colour should be green: {0,255,128}
  • fix the gaps between boundaries and fill patterns

This is now named turbinepelton and also displayed in the pelton turbine model
Only one remaining: wicketGateGeometry but that one does not seem to be used in the Modelica models.
@dietmarw dietmarw merged commit b064d1b into OpenSimHub:master Nov 6, 2020
@dietmarw dietmarw linked an issue Nov 6, 2020 that may be closed by this pull request
12 tasks
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.

Missing source files of png images
2 participants