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 icons of electrical sensors #3358

Merged
merged 8 commits into from
Jan 22, 2020
Merged

Fix icons of electrical sensors #3358

merged 8 commits into from
Jan 22, 2020

Conversation

christiankral
Copy link
Contributor

Refs #3354 and extends it to transient electrical sensors. This PR fixes

  • size of %name
  • match color of connectors and connection lines of icon
  • unify appearance of electrical flow sensors (current, flux) with one solid line from the left to right connector, indicating the there is no potential difference from one connector to the other (this was implemented for some electrical sensors already, and is unified now)

image

@christiankral christiankral added L: Electrical.Analog Issue addresses Modelica.Electrical.Analog L: Electrical.Polyphase Issue addresses Modelica.Electrical.Polyhase L: Electrical.QuasiStatic Issue addresses Modelica.Electrical.QuasiStatic labels Jan 21, 2020
@christiankral christiankral added this to the MSL4.0.0 milestone Jan 21, 2020
@beutlich
Copy link
Member

Oops, why do I see the comparisonSignals.txt of #3348 here?

@christiankral
Copy link
Contributor Author

Bad news :-(

I created the branch not from master apparently. Definitely my fault. @beutlich Do you see a way to fix this issue in an elegant way or do I have to start over and re-apply all the changes manually.

@beutlich
Copy link
Member

Hang on. Can do.

@christiankral
Copy link
Contributor Author

Would cherry-picking help?

@christiankral
Copy link
Contributor Author

Thanks

@beutlich
Copy link
Member

beutlich commented Jan 21, 2020 •
edited

Yes, that is the way to go.

@beutlich
Copy link
Member

Fixed.

@beutlich beutlich removed their request for review January 21, 2020 18:51
@christiankral
Copy link
Contributor Author

Thanks a lot!

@beutlich beutlich merged commit a1a37c9 into modelica:master Jan 22, 2020
@beutlich beutlich removed the request for review from AHaumer February 6, 2020 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dietmarw dietmarw dietmarw approved these changes

Assignees

@beutlich beutlich

Labels
L: Electrical.Analog Issue addresses Modelica.Electrical.Analog L: Electrical.Polyphase Issue addresses Modelica.Electrical.Polyhase L: Electrical.QuasiStatic Issue addresses Modelica.Electrical.QuasiStatic
Projects
None yet
Milestone
MSL4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@christiankral @beutlich @dietmarw