Skip to content

Commit 0a88295

Browse files
committed
refs #340: Rename icons
1 parent 43020b6 commit 0a88295

File tree

21 files changed

+101
-91
lines changed

21 files changed

+101
-91
lines changed

Modelica/Electrical/Analog/Interfaces.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ The device temperature <strong>internalHeatPort.T</strong> can be used to descri
438438

439439
partial model AbsoluteSensor
440440
"Base class to measure the absolute value of a pin variable"
441-
extends Modelica.Icons.RotationalSensor;
441+
extends Modelica.Icons.RoundSensor;
442442

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

474474
partial model RelativeSensor
475475
"Base class to measure a relative variable between two pins"
476-
extends Modelica.Icons.RotationalSensor;
476+
extends Modelica.Icons.RoundSensor;
477477

478478
Interfaces.PositivePin p "Positive electrical pin" annotation (Placement(
479479
transformation(extent={{-110,-10},{-90,10}})));

Modelica/Electrical/Analog/Sensors.mo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package Sensors "Potential, voltage, current, and power sensors"
44
extends Modelica.Icons.SensorsPackage;
55

66
model PotentialSensor "Sensor to measure the potential"
7-
extends Modelica.Icons.RotationalSensor;
7+
extends Modelica.Icons.RoundSensor;
88

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

4242
model VoltageSensor "Sensor to measure the voltage between two pins"
43-
extends Modelica.Icons.RotationalSensor;
43+
extends Modelica.Icons.RoundSensor;
4444

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

8686
model CurrentSensor "Sensor to measure the current in a branch"
87-
extends Modelica.Icons.RotationalSensor;
87+
extends Modelica.Icons.RoundSensor;
8888

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

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

204204
model MultiSensor "Sensor to measure current, voltage and power"
205-
extends Modelica.Icons.RotationalSensor;
205+
extends Modelica.Icons.RoundSensor;
206206
Modelica.Electrical.Analog.Interfaces.PositivePin pc
207207
"Positive pin, current path"
208208
annotation (Placement(transformation(extent={{-90,-10},{-110,10}})));

Modelica/Electrical/Machines.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11743,7 +11743,7 @@ The induction machine models use package SpacePhasors.
1174311743
package Sensors "Sensors for machine modelling"
1174411744
extends Modelica.Icons.SensorsPackage;
1174511745
model VoltageQuasiRMSSensor "Length of space phasor -> RMS voltage"
11746-
extends Modelica.Icons.RotationalSensor;
11746+
extends Modelica.Icons.RoundSensor;
1174711747
constant Integer m(final min=1) = 3 "Number of phases";
1174811748
Modelica.Blocks.Interfaces.RealOutput V(final quantity=
1174911749
"ElectricPotential", final unit="V") annotation (Placement(
@@ -11806,7 +11806,7 @@ output is length of the space phasor divided by sqrt(2), thus giving in sinusoid
1180611806
end VoltageQuasiRMSSensor;
1180711807

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

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

1192311923
model MechanicalPowerSensor "Mechanical power = torque x speed"
11924-
extends Modelica.Icons.RotationalSensor;
11924+
extends Modelica.Icons.RoundSensor;
1192511925
extends Modelica.Mechanics.Rotational.Interfaces.PartialTwoFlanges;
1192611926
parameter Boolean useSupport=false "Use support or fixed housing"
1192711927
annotation (Evaluate=true);

Modelica/Electrical/Polyphase.mo

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2898,7 +2898,7 @@ This function determines the indices of non-positive sequence of the symmetrical
28982898
extends Modelica.Icons.SensorsPackage;
28992899

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

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

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

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

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

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

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

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

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

33833383
model ReactivePowerSensor "Three-phase sensor for reactive power"
33843384
import Modelica;
3385-
extends Modelica.Icons.RotationalSensor;
3385+
extends Modelica.Icons.RoundSensor;
33863386
final parameter Integer m(final min=1) = 3 "Number of phases";
33873387
Interfaces.PositivePlug plug_p(final m=m) annotation (Placement(
33883388
transformation(extent={{-110,-10},{-90,10}})));

Modelica/Electrical/QuasiStatic/Polyphase.mo

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3003,7 +3003,7 @@ This sensor can be used to measure <em>m</em> complex voltages, using <em>m</em>
30033003

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

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

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

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

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

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

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

42924292
partial model RelativeSensor "Partial voltage / current sensor"
4293-
extends Modelica.Icons.RotationalSensor;
4293+
extends Modelica.Icons.RoundSensor;
42944294
extends TwoPlug;
42954295
Modelica.ComplexBlocks.Interfaces.ComplexOutput y[m] annotation (
42964296
Placement(transformation(

Modelica/Electrical/QuasiStatic/SinglePhase.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2121,7 +2121,7 @@ This sensor can be used to measure the complex current.
21212121

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

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

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

27852785
partial model RelativeSensor "Partial voltage / current sensor"
2786-
extends Modelica.Icons.RotationalSensor;
2786+
extends Modelica.Icons.RoundSensor;
27872787
extends OnePort;
27882788
Modelica.ComplexBlocks.Interfaces.ComplexOutput y annotation (Placement(
27892789
transformation(

0 commit comments

Comments
 (0)