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

Remove obsolete drawings of diagram layer #3303

Merged
merged 50 commits into from
Jan 16, 2020
Merged

Remove obsolete drawings of diagram layer #3303

merged 50 commits into from
Jan 16, 2020

Conversation

christiankral
Copy link
Contributor

@christiankral christiankral commented Jan 11, 2020 •
edited

Incorporating #3056

In order to review this PR it makes sense to have a look at the diagram layers of models in the following packages:

  • Modelica.Blocks.Continuous
  • Modelica.Blocks.Discrete
  • Modelica.Blocks.Continuous
  • Modelica.Blocks.Discrete
  • Modelica.Blocks.Interfaces
  • Modelica.Blocks.Logical
  • Modelica.Blocks.Math
  • Modelica.Blocks.Math
  • Modelica.Blocks.Nonlinear
  • Modelica.Blocks.Routing
  • Modelica.Blocks.Sources
  • Modelica.Blocks.Tables
  • Modelica.ComplexBlocks
  • Modelica.Magnetic.FluxTubes.Basic
  • Modelica.Magnetic.FluxTubes.Sources
  • Modelica.Magnetic.FundamentalWave.Components
  • Modelica.Magnetic.QuasiStatic.FundamentalWave.Components
  • Modelica.Thermal.HeatTransfer.Components
  • Modelica.Thermal.HeatTransfer.Sources
  • Modelica.Thermal.HeatTransfer.Components
  • Modelica.Thermal.HeatTransfer.Celsius
  • Modelica.Thermal.HeatTransfer.Fahrenheit
  • Modelica.Thermal.HeatTransfer.Rankine
  • Modelica.Mechanics.Rotational.Components
  • Modelica.Mechanics.Rotational.Sources
  • Modelica.Mechanics.Translational.Components
  • Modelica.Thermal.FluidHeatFlow.BaseClasses
  • Modelica.Math
  • Modelica.Electrical.Analog.Lines
  • Modelica.Electrical.Analog.Semiconductors.Thyristor
  • Modelica.Electrical.Analog.Sources

@christiankral christiankral added the L: Blocks Issue addresses Modelica.Blocks label Jan 11, 2020
@christiankral christiankral added this to the MSL4.0.0 milestone Jan 11, 2020
@christiankral
Remove diagram layers of Modelica.Blocks.Discrete
c6f5cf3
@christiankral
Remove redundant diagram layers of Modelica.Blocks.Interfaces
5edb2d2
@christiankral
Remove redundant diagram layers of Modelica.Blocks.Logical
9409d14 
an move them to the Info layer
@christiankral
Remove obsolete diagram layers of Modelica.Blocks.Math
e215d76 
(1)
@christiankral
Update icon %name size to match guidelines
8a5caed
@christiankral
Remove obsolete diagram layers of Modelica.Blocks.Math
c13102c
@christiankral
Remove redundant diagram layers of Modelica.Blocks.Nonlinear
42bd812
@christiankral
Remove redundant diagram layers of Modelica.Blocks.Routing
4101f39
@christiankral
Remove obsolete diagram layers of Modelica.Blocks.Sources
b111e62
@christiankral
Remove obsolete diagram layers of Modelica.Blocks.Tables
7b2e737
@christiankral
Fix location connectors in diagram layer
87d5a93
@christiankral
Remove redundant diagram layers of Modelica.ComplexBlocks.Sources
65db9a2
@christiankral
Remove redundant diagram layers of Modelica.Magnetic.FluxTubes.Basic
2a4e51f
@christiankral
Fix location of connector in diagram layer of SignalMagneticPotential…
f4a0f94 
…Difference
@christiankral
Remove redundant diagram layers of Modelica.Magnetic.QuasiStatic.Fund…
d967867 
…amentalWave.Components
@christiankral
Remove redundant diagram layers of various grounds
58ee651
@christiankral
Remove redundant diagram layers of Modelica.Magnetic.FundamentalWave.…
ec90a80 
…Components
@christiankral
Remove redundant diagram layers of Modelica.Thermal.HeatTransfer.Sources
8c43282
@christiankral
Remove redundant diagram layers of Modelica.Thermal.HeatTransfer.Comp…
b127336 
…onents
@christiankral
Remove redundant diagram layers of Modelica.Thermal.HeatTransfer.Celsius
b9401f9
@christiankral
Copy link
Contributor Author

... PID has shrunk the P I and D-blocks...

Re-introduced by 58a17a1

@christiankral
Copy link
Contributor Author

So hopefully all the deleted components are re-introduced. The affected packages are all checked OK.

@christiankral christiankral mentioned this pull request Jan 15, 2020
Closed
HansOlsson
HansOlsson approved these changes Jan 16, 2020
View reviewed changes
Copy link
Contributor

@HansOlsson HansOlsson left a comment

Choose a reason for hiding this comment

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

I think it looks ok now, but there are a lot of changes so I might have missed something.

This was referenced Jan 16, 2020
Merged
Merged
dietmarw pushed a commit that referenced this pull request Jan 16, 2020
@AHaumer @dietmarw
Revert "Split Mechanics.Translational into single files (#3319)"
2fdd1aa 
This reverts commit 5867ad9.

Because #3303 needs to get merged first.
dietmarw pushed a commit that referenced this pull request Jan 16, 2020
@AHaumer @dietmarw
Revert "Split Mechanics.Rotational into single files (#3318)"
9933107 
This reverts commit 24ebba3.

Because #3303 needs to get merged first.
@beutlich beutlich assigned dietmarw and unassigned beutlich Jan 16, 2020
@dietmarw dietmarw merged commit 2f6ae65 into modelica:master Jan 16, 2020
@christiankral christiankral mentioned this pull request Jan 16, 2020
Closed
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

@HansOlsson HansOlsson HansOlsson approved these changes

Assignees

@dietmarw dietmarw

Labels
L: Blocks Issue addresses Modelica.Blocks L: Complex* Issue addresses Complex, Modelica.ComplexBlocks or Modelica.ComplexMath L: Electrical.Analog Issue addresses Modelica.Electrical.Analog L: Magnetic.FluxTubes Issue addresses Modelica.Magnetic.FluxTubes L: Magnetic.FundamentalWave Issue addresses Modelica.Magnetic.FundamentalWave L: Magnetic.QuasiStatic Issue addresses Modelica.Magnetic.QuasiStatic L: Math Issue addresses Modelica.Math L: Mechanics.Rotational Issue addresses Modelica.Mechanics.Rotational L: Mechanics.Translational Issue addresses Modelica.Mechanics.Translational L: Thermal.FluidHeatFlow Issue addresses Modelica.Thermal.FluidHeatFlow L: Thermal.HeatTransfer Issue addresses Modelica.Thermal.HeatTransfer task General work that is not related to a bug or feature
Projects
None yet
Milestone
MSL4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@christiankral @dietmarw @claassistantio @HansOlsson @beutlich