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

Fix icon for Electrical.Digital #2163

Merged
merged 1 commit into from
Feb 12, 2017
Merged

Fix icon for Electrical.Digital #2163

merged 1 commit into from
Feb 12, 2017

Conversation

sjoelund
Copy link
Member

@sjoelund sjoelund commented Feb 9, 2017

Current icon has the lines in the wrong part of the annotation.

The error was found when making OMEdit report failure to interpret icon annotations. The change was tested in OMEdit and looks reasonable (please review; I can add it to maint/3.2.2 once accepted into the master). The source of the error seems to be bf5ac67 (@otter), which says it added an icon for Digital (but there seems to have already been an icon there).

@sjoelund
Copy link
Member Author

sjoelund commented Feb 9, 2017

Actually, there seems to be one line in there that I am unsure if it belongs or not. I'll the icon and one without the line I am uncertain about.

As it looks in the PR:
digital-all

What it should look like?
digital-cleaned

@jespermattsson
Copy link
Collaborator

jespermattsson commented Feb 9, 2017

I think the extra line might be meant to represent a digital signal. (Although it is more like a ternary signal in that case.)

@tbeu
Copy link
Contributor

tbeu commented Feb 9, 2017

Point to @MartinOtter instead of otter.

@beutlich beutlich added the L: Electrical.Digital Issue addresses Modelica.Electrical.Digital label Feb 9, 2017
@beutlich
Copy link
Member

beutlich commented Feb 9, 2017

Please remove that ternary signal line added by bf5ac67 and reveal the block icon.

Reverts the changes in bf5ac67 and instead fixes the error that caused
the old icon to not be displayed.
@sjoelund
Copy link
Member Author

So the second image, then? Basically reverting bf5ac67 and instead of adding the signal fixing the error in the icon.

@beutlich
Copy link
Member

LGTM.

@beutlich beutlich merged commit 2d8fb4c into modelica:master Feb 12, 2017
@beutlich beutlich added this to the MSL_next-MINOR-version milestone Feb 12, 2017
@beutlich
Copy link
Member

Also cherry-picked in maint/3.2.2 branch.

@beutlich beutlich self-assigned this Feb 12, 2017
@sjoelund sjoelund deleted the electrical-digital-master branch February 13, 2017 07:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
L: Electrical.Digital Issue addresses Modelica.Electrical.Digital
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants