Skip to content

Commit

Permalink
refs modelica#340: Rename icons
Browse files Browse the repository at this point in the history
  • Loading branch information
beutlich committed Jul 18, 2019
1 parent 43020b6 commit 886cd5f
Show file tree
Hide file tree
Showing 21 changed files with 101 additions and 91 deletions.
4 changes: 2 additions & 2 deletions Modelica/Electrical/Analog/Interfaces.mo
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ The device temperature <strong>internalHeatPort.T</strong> can be used to descri

partial model AbsoluteSensor
"Base class to measure the absolute value of a pin variable"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;

Interfaces.PositivePin p "Positive electrical pin" annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -473,7 +473,7 @@ The device temperature <strong>internalHeatPort.T</strong> can be used to descri

partial model RelativeSensor
"Base class to measure a relative variable between two pins"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;

Interfaces.PositivePin p "Positive electrical pin" annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down
10 changes: 5 additions & 5 deletions Modelica/Electrical/Analog/Sensors.mo
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package Sensors "Potential, voltage, current, and power sensors"
extends Modelica.Icons.SensorsPackage;

model PotentialSensor "Sensor to measure the potential"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;

Interfaces.PositivePin p "pin to be measured" annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -40,7 +40,7 @@ package Sensors "Potential, voltage, current, and power sensors"
end PotentialSensor;

model VoltageSensor "Sensor to measure the voltage between two pins"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;

Interfaces.PositivePin p "positive pin" annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -84,7 +84,7 @@ package Sensors "Potential, voltage, current, and power sensors"
end VoltageSensor;

model CurrentSensor "Sensor to measure the current in a branch"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;

Interfaces.PositivePin p "positive pin" annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -135,7 +135,7 @@ package Sensors "Potential, voltage, current, and power sensors"
end CurrentSensor;

model PowerSensor "Sensor to measure the power"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
Modelica.Electrical.Analog.Interfaces.PositivePin pc
"Positive pin, current path"
annotation (Placement(transformation(extent={{-90,-10},{-110,10}})));
Expand Down Expand Up @@ -202,7 +202,7 @@ equation
end PowerSensor;

model MultiSensor "Sensor to measure current, voltage and power"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
Modelica.Electrical.Analog.Interfaces.PositivePin pc
"Positive pin, current path"
annotation (Placement(transformation(extent={{-90,-10},{-110,10}})));
Expand Down
8 changes: 4 additions & 4 deletions Modelica/Electrical/Machines.mo
Original file line number Diff line number Diff line change
Expand Up @@ -11743,7 +11743,7 @@ The induction machine models use package SpacePhasors.
package Sensors "Sensors for machine modelling"
extends Modelica.Icons.SensorsPackage;
model VoltageQuasiRMSSensor "Length of space phasor -> RMS voltage"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
constant Integer m(final min=1) = 3 "Number of phases";
Modelica.Blocks.Interfaces.RealOutput V(final quantity=
"ElectricPotential", final unit="V") annotation (Placement(
Expand Down Expand Up @@ -11806,7 +11806,7 @@ output is length of the space phasor divided by sqrt(2), thus giving in sinusoid
end VoltageQuasiRMSSensor;

model CurrentQuasiRMSSensor "Length of space phasor -> RMS current"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
constant Integer m(final min=1) = 3 "Number of phases";
Modelica.Blocks.Interfaces.RealOutput I(final quantity="ElectricCurrent",
final unit="A") annotation (Placement(transformation(
Expand Down Expand Up @@ -11868,7 +11868,7 @@ output is length of the space phasor divided by sqrt(2), thus giving in sinusoid
end CurrentQuasiRMSSensor;

model ElectricalPowerSensor "Instantaneous power from space phasors"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
constant Integer m(final min=1) = 3 "Number of phases";
Modelica.Blocks.Interfaces.RealOutput P(final quantity="Power", final
unit="W") annotation (Placement(transformation(
Expand Down Expand Up @@ -11921,7 +11921,7 @@ which are used to calculate power quantities:
end ElectricalPowerSensor;

model MechanicalPowerSensor "Mechanical power = torque x speed"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
extends Modelica.Mechanics.Rotational.Interfaces.PartialTwoFlanges;
parameter Boolean useSupport=false "Use support or fixed housing"
annotation (Evaluate=true);
Expand Down
18 changes: 9 additions & 9 deletions Modelica/Electrical/Polyphase.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2898,7 +2898,7 @@ This function determines the indices of non-positive sequence of the symmetrical
extends Modelica.Icons.SensorsPackage;

model PotentialSensor "Polyphase potential sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
parameter Integer m(final min=1) = 3 "Number of phases";
Interfaces.PositivePlug plug_p(final m=m) annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -2934,7 +2934,7 @@ thus measuring the m potentials <em>phi[m]</em> of the m pins of plug_p.
end PotentialSensor;

model VoltageSensor "Polyphase voltage sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
parameter Integer m(final min=1) = 3 "Number of phases";
Interfaces.PositivePlug plug_p(final m=m) annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -2979,7 +2979,7 @@ thus measuring the m potential differences <em>v[m]</em> between the m pins of p

model VoltageQuasiRMSSensor
"Continuous quasi voltage RMS sensor for polyphase system"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
extends Modelica.Electrical.Polyphase.Interfaces.TwoPlug;
parameter Integer m(min=1) = 3 "Number of phases";

Expand Down Expand Up @@ -3031,7 +3031,7 @@ This sensor determines the continuous quasi <a href=\"Modelica://Modelica.Blocks
end VoltageQuasiRMSSensor;

model CurrentSensor "Polyphase current sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
parameter Integer m(final min=1) = 3 "Number of phases";
Interfaces.PositivePlug plug_p(final m=m) annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -3077,7 +3077,7 @@ thus measuring the m currents <em>i[m]</em> flowing from the m pins of plug_p to

model CurrentQuasiRMSSensor
"Continuous quasi current RMS sensor for polyphase system"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
extends Modelica.Electrical.Polyphase.Interfaces.TwoPlug;
parameter Integer m(min=1) = 3 "Number of phases";
Modelica.Blocks.Interfaces.RealOutput I
Expand Down Expand Up @@ -3132,7 +3132,7 @@ This sensor determines the continuous quasi <a href=\"Modelica://Modelica.Blocks
end CurrentQuasiRMSSensor;

model PowerSensor "Polyphase instantaneous power sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
parameter Integer m(min=1) = 3 "Number of phases";
Polyphase.Interfaces.PositivePlug pc(final m=m)
"Positive plug, current path" annotation (Placement(transformation(
Expand Down Expand Up @@ -3212,7 +3212,7 @@ This power sensor measures instantaneous electrical power of a polyphase system
end PowerSensor;

model MultiSensor "Polyphase sensor to measure current, voltage and power"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
parameter Integer m(min=1) = 3 "Number of phases";
Modelica.Electrical.Polyphase.Interfaces.PositivePlug pc(final m=m)
"Positive plug, current path"
Expand Down Expand Up @@ -3297,7 +3297,7 @@ The internal resistance of each current path is zero, the internal resistance of

model AronSensor "Three-phase Aron sensor for active power"
import Modelica;
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
final parameter Integer m(final min=1) = 3 "Number of phases";
Interfaces.PositivePlug plug_p(final m=m) annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -3382,7 +3382,7 @@ Reinhard Lerch: Elektrische Messtechnik. Springer Vieweg.

model ReactivePowerSensor "Three-phase sensor for reactive power"
import Modelica;
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
final parameter Integer m(final min=1) = 3 "Number of phases";
Interfaces.PositivePlug plug_p(final m=m) annotation (Placement(
transformation(extent={{-110,-10},{-90,10}})));
Expand Down
16 changes: 8 additions & 8 deletions Modelica/Electrical/QuasiStatic/Polyphase.mo
Original file line number Diff line number Diff line change
Expand Up @@ -3003,7 +3003,7 @@ This sensor can be used to measure <em>m</em> complex voltages, using <em>m</em>

model VoltageQuasiRMSSensor
"Continuous quasi voltage RMS sensor for polyphase system"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
extends Modelica.Electrical.QuasiStatic.Polyphase.Interfaces.TwoPlug;
parameter Integer m(min=1) = 3 "Number of phases";
Modelica.Blocks.Interfaces.RealOutput V
Expand Down Expand Up @@ -3120,7 +3120,7 @@ This sensor can be used to measure <em>m</em> complex currents, using <em>m</em>

model CurrentQuasiRMSSensor
"Continuous quasi current RMS sensor for polyphase system"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
extends Modelica.Electrical.QuasiStatic.Polyphase.Interfaces.TwoPlug;
parameter Integer m(min=1) = 3 "Number of phases";
Modelica.Blocks.Interfaces.RealOutput I
Expand Down Expand Up @@ -3192,7 +3192,7 @@ value of a polyphase current system, by averaging the phase RMS current phasors
end CurrentQuasiRMSSensor;

model PowerSensor "Power sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
parameter Integer m(min=1) = 3 "Number of phases";
Modelica.SIunits.AngularVelocity omega=der(currentP.reference.gamma);
Interfaces.PositivePlug currentP(final m=m) annotation (Placement(
Expand Down Expand Up @@ -3298,7 +3298,7 @@ This sensor can be used to measure <em>m</em> complex apparent power values, usi
end PowerSensor;

model MultiSensor "Polyphase sensor to measure current, voltage and power"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
import Modelica.ComplexMath.conj;
import Modelica.ComplexMath.'sum';
import Modelica.ComplexMath.'abs';
Expand Down Expand Up @@ -3419,7 +3419,7 @@ The internal resistance of each current path is zero, the internal resistance of

model AronSensor "Three-phase Aron sensor for active power"
import Modelica;
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
final parameter Integer m(final min=1) = 3 "Number of phases";
Modelica.Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug plug_p(final m=m)
annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -3516,7 +3516,7 @@ Reinhard Lerch: Elektrische Messtechnik. Springer Vieweg.

model ReactivePowerSensor "Three-phase sensor for reactive power"
import Modelica;
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
final parameter Integer m(final min=1) = 3 "Number of phases";
Modelica.Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug plug_p(final m=m)
annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
Expand Down Expand Up @@ -4254,7 +4254,7 @@ a <a href=\"modelica://Modelica.Electrical.QuasiStatic.Polyphase.Basic.PlugToPin
end OnePort;

partial model AbsoluteSensor "Partial potential sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
parameter Integer m(min=1) = 3 "Number of phases";
Modelica.SIunits.AngularVelocity omega;
PositivePlug plug_p(final m=m)
Expand Down Expand Up @@ -4290,7 +4290,7 @@ The absolute sensor partial model relies on the a
end AbsoluteSensor;

partial model RelativeSensor "Partial voltage / current sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
extends TwoPlug;
Modelica.ComplexBlocks.Interfaces.ComplexOutput y[m] annotation (
Placement(transformation(
Expand Down
8 changes: 4 additions & 4 deletions Modelica/Electrical/QuasiStatic/SinglePhase.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2121,7 +2121,7 @@ This sensor can be used to measure the complex current.

model PowerSensor "Power sensor"
import Modelica.ComplexMath.conj;
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
Interfaces.PositivePin currentP annotation (Placement(transformation(
extent={{-110,-10},{-90,10}})));
Interfaces.NegativePin currentN annotation (Placement(transformation(
Expand Down Expand Up @@ -2193,7 +2193,7 @@ This sensor can be used to measure the complex apparent power.
end PowerSensor;

model MultiSensor "Sensor to measure current, voltage and power"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
import Modelica.ComplexMath.conj;
import Modelica.ComplexMath.'abs';
import Modelica.ComplexMath.arg;
Expand Down Expand Up @@ -2751,7 +2751,7 @@ This model is intended to be used with textual representation of user models.
end OnePort;

partial model AbsoluteSensor "Partial potential sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
Modelica.SIunits.AngularVelocity omega;
PositivePin pin "Positive quasi-static single-phase pin" annotation (Placement(transformation(extent={{-110,
-10},{-90,10}})));
Expand Down Expand Up @@ -2783,7 +2783,7 @@ The absolute sensor partial model provides a single
end AbsoluteSensor;

partial model RelativeSensor "Partial voltage / current sensor"
extends Modelica.Icons.RotationalSensor;
extends Modelica.Icons.RoundSensor;
extends OnePort;
Modelica.ComplexBlocks.Interfaces.ComplexOutput y annotation (Placement(
transformation(
Expand Down
Loading

0 comments on commit 886cd5f

Please sign in to comment.