Skip to content

Commit 4025b10

Browse files
christiankralchristiankral
authoredOct 19, 2023
Merge pull request #4206 from christiankral/remove-diagram-text2
Remove redundant diagram text from Analog examples
·
v4.1.0-rc.1v4.1.0-alpha.1
2 parents a2c282e + 9ecd5a8 commit 4025b10

18 files changed

+32
-92
lines changed
 

Diff for: ‎Modelica/Electrical/Analog/Examples/CauerLowPassAnalog.mo

+1-5
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,7 @@ equation
107107
extent={{-62,-48},{-58,-52}},
108108
lineColor={0,0,255},
109109
fillColor={85,85,255},
110-
fillPattern=FillPattern.Solid),
111-
Text(
112-
extent={{-120,100},{120,80}},
113-
textString="CauerLowPassAnalog",
114-
textColor={0,0,255})}),
110+
fillPattern=FillPattern.Solid)}),
115111
experiment(StopTime=60),
116112
Documentation(revisions="<html>
117113
<ul>

Diff for: ‎Modelica/Electrical/Analog/Examples/CauerLowPassOPV.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,7 @@ equation
253253
connect(V.n, R1.p) annotation (Line(points={{-240,-160},{-250,-160},
254254
{-250,-40},{-240,-40}}, color={0,0,255}));
255255
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-250,
256-
-200},{250,200}}), graphics={Text(
257-
extent={{-130,172},{80,120}},
258-
textString="CauerLowPassOPV",
259-
textColor={0,0,255})}),
256+
-200},{250,200}})),
260257
experiment(StopTime=60),
261258
Documentation(revisions="<html>
262259
<ul>

Diff for: ‎Modelica/Electrical/Analog/Examples/CauerLowPassSC.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,7 @@ equation
264264
connect(R11.p, p4) annotation (Line(
265265
points={{207.8,60},{190,60},{190,20}}, color={0,0,255}));
266266
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-250,
267-
-200},{250,200}}), graphics={Text(
268-
extent={{-100,180},{94,140}},
269-
textString="CauerLowPassSC",
270-
textColor={0,0,255})}),
267+
-200},{250,200}})),
271268
experiment(StopTime=60, Interval=0.04),
272269
Documentation(revisions="<html>
273270
<ul>

Diff for: ‎Modelica/Electrical/Analog/Examples/CharacteristicIdealDiodes.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ equation
7474
annotation (Line(points={{-20,-50},{-20,-60},{-40,-60}}, color={0,0,255}));
7575
annotation (
7676
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
77-
100,100}}), graphics={Text(
78-
extent={{-88,102},{92,48}},
79-
textString="Characteristic Ideal Diodes",
80-
textColor={0,0,255})}),
77+
100,100}})),
8178
Documentation(info="<html>
8279
<p>Three examples of ideal diodes are shown:
8380
<br>the <strong>totally ideal diode</strong> (Ideal) with all parameters to be zero,

Diff for: ‎Modelica/Electrical/Analog/Examples/CharacteristicThyristors.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,7 @@ equation
8484
connect(booleanPulse.y, IdealThyristor2.fire) annotation (Line(
8585
points={{-47,-20},{0,-20},{0,-28}}, color={255,0,255}));
8686
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
87-
{100,100}}), graphics={Text(
88-
extent={{-96,100},{98,60}},
89-
textString="Characteristic Thyristors",
90-
textColor={0,0,255})}), Documentation(info="<html>
87+
{100,100}})), Documentation(info="<html>
9188
<p>This example compares the behavior of the <strong>ideal thyristor</strong> and the <strong>ideal GTO thyristor</strong> with <em>Vknee=1</em> both. The thyristors IdealThyristor1 and IdealGTOThyristor1 are controlled by an unregular Boolean fire signal. The aim is to show several cases for the fire signal in combination with the state (s&lt;0 or s&gt;0)of the thyristors. Please simulate until 6 seconds and compare IdealThyristor1.v with IdealGTOThyristor1.v, the same with IdealThyristor1.s and IdealGTOThyristor1.s (attention: s is a protected variable in each thyristor). Also compare IdealThyristor1.off and IdealGTOThyristor1.off and have a look at the fire signal (e.g. IdealThyristor1.fire). It can be seen that the IdealGTOThyristor1 reacts on switching off the fire signal whereas the IdealThyristor1 does not show this behavior.</p>
9289
<p>The other thyristors IdealThyristor2 and IdealGTOThyristor2 are controlled by an periodic Boolean fire signal to show a typical use case. Please compare IdealThyristor2.v with IdealGTOThyristor2.v</p>
9390
</html>",

Diff for: ‎Modelica/Electrical/Analog/Examples/ChuaCircuit.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,5 @@ Christoph Clau&szlig;
7373
</html>"),
7474
experiment(StopTime=5e4, Interval=1),
7575
Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
76-
100,100}}), graphics={Text(
77-
extent={{-98,104},{-32,72}},
78-
textColor={0,0,255},
79-
textString="Chua Circuit")}));
76+
100,100}})));
8077
end ChuaCircuit;

Diff for: ‎Modelica/Electrical/Analog/Examples/CompareTransformers.mo

+12-18
Original file line numberDiff line numberDiff line change
@@ -122,30 +122,24 @@ equation
122122
annotation (Line(points={{80,-60},{80,-70}}, color={0,0,255}));
123123
connect(resistor22.n, load2.p)
124124
annotation (Line(points={{80,-30},{80,-40}}, color={0,0,255}));
125-
connect(ground11.p, basicTransformer.n1) annotation (Line(points={{-80,20},
126-
{-10,20},{-10,45}}, color={0,0,255}));
127-
connect(basicTransformer.n2, ground12.p) annotation (Line(points={{10,45},{10,
125+
connect(ground11.p, basicTransformer.n1) annotation (Line(points={{-80,20},{
126+
-10,20},{-10,40}}, color={0,0,255}));
127+
connect(basicTransformer.n2, ground12.p) annotation (Line(points={{10,40},{10,
128128
20},{80,20}}, color={0,0,255}));
129-
connect(basicTransformer.p1, resistor11.n) annotation (Line(points={{-10,55},
129+
connect(basicTransformer.p1, resistor11.n) annotation (Line(points={{-10,60},
130130
{-10,60},{-60,60}}, color={0,0,255}));
131-
connect(basicTransformer.p2, resistor12.p) annotation (Line(points={{10,55},{
131+
connect(basicTransformer.p2, resistor12.p) annotation (Line(points={{10,60},{
132132
10,60},{60,60}}, color={0,0,255}));
133-
connect(ground21.p, idealTransformer.n1) annotation (Line(points={{-80,-70},
134-
{-10,-70},{-10,-45}}, color={0,0,255}));
133+
connect(ground21.p, idealTransformer.n1) annotation (Line(points={{-80,-70},{
134+
-10,-70},{-10,-50}}, color={0,0,255}));
135135
connect(ground22.p, idealTransformer.n2) annotation (Line(points={{80,-70},{
136-
10,-70},{10,-45}}, color={0,0,255}));
137-
connect(idealTransformer.p1, inductor21.n) annotation (Line(points={{-10,
138-
-35},{-10,-30},{-30,-30}}, color={0,0,255}));
139-
connect(idealTransformer.p2, inductor22.p) annotation (Line(points={{10,-35},
136+
10,-70},{10,-50}}, color={0,0,255}));
137+
connect(idealTransformer.p1, inductor21.n) annotation (Line(points={{-10,-30},
138+
{-10,-30},{-30,-30}}, color={0,0,255}));
139+
connect(idealTransformer.p2, inductor22.p) annotation (Line(points={{10,-30},
140140
{10,-30},{30,-30}}, color={0,0,255}));
141141
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
142-
-100},{100,100}}), graphics={Text(
143-
extent={{-60,-80},{60,-100}},
144-
textColor={0,0,255},
145-
textString="try considerMagnetization=false/true"), Text(
146-
extent={{-60,20},{60,0}},
147-
textColor={0,0,255},
148-
textString="Basic.Transformer (mutual inductance)")}),
142+
-100},{100,100}})),
149143
experiment(StopTime=50, Interval=0.001),
150144
Documentation(revisions="<html>
151145
<dl>

Diff for: ‎Modelica/Electrical/Analog/Examples/ControlledSwitchWithArc.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ equation
7676
connect(sineVoltage.n, ground.p) annotation (Line(
7777
points={{-70,-20},{-70,-40}}, color={0,0,255}));
7878
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
79-
-100},{100,100}}), graphics={Text(
80-
extent={{-100,80},{100,60}},
81-
textColor={0,0,255},
82-
textString="Compare voltage and current of inductor1 and inductor2")}),
79+
-100},{100,100}})),
8380
experiment(
8481
StopTime=6,
8582
Interval=0.00025,

Diff for: ‎Modelica/Electrical/Analog/Examples/DifferenceAmplifier.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,5 @@ Christoph Clau&szlig;
128128
</html>"),
129129
experiment(StopTime=1e-8),
130130
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
131-
100,100}}), graphics={Text(
132-
extent={{-98,106},{22,60}},
133-
textColor={0,0,255},
134-
textString="Difference Amplifier")}));
131+
100,100}})));
135132
end DifferenceAmplifier;

Diff for: ‎Modelica/Electrical/Analog/Examples/HeatingMOSInverter.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,7 @@ equation
8686
connect(H_PMOS.G, Sin.p) annotation (Line(
8787
points={{-40,44},{-48,44},{-48,44},{-54,44},{-54,10},{-70,10}}, color={0,0,255}));
8888
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
89-
-100},{100,100}}), graphics={Text(
90-
extent={{-100,100},{-6,72}},
91-
textString="Heating MOS Inverter",
92-
textColor={0,0,255})}), Documentation(info="<html>
89+
-100},{100,100}})), Documentation(info="<html>
9390
<p>The heating MOS inverter shows a heat flow always if a transistor is leading.</p>
9491
<p>Simulate until T=5 s. Plot in separate windows:<br> Sin.p.v and Capacitor1.p.v<br>HeatCapacitor1.port.T and H_PMOS.heatPort.T and H_NMOS.heatPort.T<br>H_PMOS.heatPort.Q_flow and H_NMOS.heatPort.Q_flow</p>
9592
</html>",

Diff for: ‎Modelica/Electrical/Analog/Examples/HeatingNPN_NORGate.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,7 @@ equation
180180
annotation (Line(points={{90,-40},{90,2},{-10,
181181
2},{-10,48}}, color={191,0,0}));
182182
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
183-
-100},{100,100}}), graphics={Text(
184-
extent={{-100,100},{-6,72}},
185-
textString="Heating \"NPN NOR\" Gate",
186-
textColor={0,0,255})}), Documentation(info="<html>
183+
-100},{100,100}})), Documentation(info="<html>
187184
<p>The heating &quot;NPN NOR&quot; gate shows a heat flow always if a transistor is leading.</p>
188185
<p>Simulate until T=200 s. Plot in separate windows:
189186
<br>V1.v and V2.v and C2.v

Diff for: ‎Modelica/Electrical/Analog/Examples/HeatingPNP_NORGate.mo

+1-5
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,7 @@ equation
176176
connect(C2.n, Gnd6.p)
177177
annotation (Line(points={{60,32},{60,26}}, color={0,0,255}));
178178
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
179-
-100},{100,100}}), graphics={Text(
180-
extent={{-98,100},{-4,72}},
181-
textColor={0,0,255},
182-
textString="Heating \"PNP NOR\" Gate")}),
183-
Documentation(info="<html>
179+
-100},{100,100}})), Documentation(info="<html>
184180
<p>The heating &quot;PNP NOR&quot; gate shows a heat flow always if a transistor is conducting.</p>
185181
<p>Simulate until T=200 s. Plot V1.v and V2.v and C2.v to see the NOR-functionality. High potential is -6V which means logic &quot;true&quot;. Low potential is 0V which means logic &quot;false&quot;.</p>
186182
<p>To see which transistor is conducting one can have a look at the temperatures T1.heatPort.T and T2.heatPort.T and the heat flows T1.heatPort.Q_flow and T2.heatPort.Q_flow of the heatports of the transistors T1 and T2.</p>

Diff for: ‎Modelica/Electrical/Analog/Examples/HeatingRectifier.mo

+1-5
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ equation
5050
annotation (Line(points={{40,80},{40,50}}, color={0,0,255}));
5151

5252
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
53-
-100},{100,100}}), graphics={Text(
54-
extent={{-94,102},{0,74}},
55-
textString="HeatingRectifier",
56-
textColor={0,0,255})}),
57-
Documentation(info="<html>
53+
-100},{100,100}})), Documentation(info="<html>
5854
<p>The heating rectifier shows a heat flow always if the electrical capacitor is loaded.</p>
5955
<p>Simulate until T=5 s.Plot in separate windows:
6056
<br>SineVoltage1.v and Capacitor1.p.v

Diff for: ‎Modelica/Electrical/Analog/Examples/NandGate.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,5 @@ Christoph Clau&szlig;
7070
</html>"),
7171
experiment(StopTime=1e-007),
7272
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
73-
100,100}}), graphics={Text(
74-
extent={{-90,98},{-12,66}},
75-
textColor={0,0,255},
76-
textString="NAND Gate")}));
73+
100,100}})));
7774
end NandGate;

Diff for: ‎Modelica/Electrical/Analog/Examples/Rectifier.mo

-3
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ equation
163163
annotation (
164164
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
165165
100}}), graphics={
166-
Text(
167-
extent={{-80,90},{80,70}},
168-
textString="Rectifier"),
169166
Line(points={{-16,18},{-16,2},{-18,6},{-14,6},{-16,2}}),
170167
Line(points={{-30,22},{-26,20},{-30,18},{-30,22}}),
171168
Line(points={{32,30},{32,-30},{30,-26},{34,-26},{32,-30}}),

Diff for: ‎Modelica/Electrical/Analog/Examples/ShowSaturatingInductor.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@ equation
5353
points={{20,-10},{20,-16},{-60,-16}}, color={0,0,255}));
5454
annotation (
5555
Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
56-
100}}), graphics={Text(
57-
extent={{-80,84},{70,38}},
58-
textColor={0,0,255},
59-
textString="Show Saturating Inductor")}),
56+
100}})),
6057
experiment(StopTime=6.2832, Interval=0.01),
6158
Documentation(info="<html>
6259
<p>This simple circuit uses the saturating inductor which has a changing inductance.</p>

Diff for: ‎Modelica/Electrical/Analog/Examples/ShowVariableResistor.mo

+1-4
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,5 @@ annotation (Documentation(info="<html>
6161
</html>"),
6262
experiment(StopTime=1),
6363
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
64-
100,100}}), graphics={Text(
65-
extent={{-100,112},{80,40}},
66-
textColor={0,0,255},
67-
textString="Example VariableResistor")}));
64+
100,100}})));
6865
end ShowVariableResistor;

Diff for: ‎Modelica/Electrical/Analog/Examples/SwitchWithArc.mo

+5-8
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,12 @@ equation
6363
annotation (Line(points={{20,-40},{40,-40}}, color={0,0,255}));
6464
connect(constantVoltage2.p,switch2. p) annotation (Line(points={{-20,-50},{
6565
-20,-40},{0,-40}}, color={0,0,255}));
66-
connect(booleanPulse.y, switch1.control) annotation (Line(points={{-59,-20},
67-
{-40,-20},{-40,60},{10,60},{10,47}}, color={255,0,255}));
68-
connect(booleanPulse.y, switch2.control) annotation (Line(points={{-59,-20},
69-
{10,-20},{10,-30}}, color={255,0,255}));
66+
connect(booleanPulse.y, switch1.control) annotation (Line(points={{-59,-20},{
67+
-40,-20},{-40,60},{10,60},{10,52}}, color={255,0,255}));
68+
connect(booleanPulse.y, switch2.control) annotation (Line(points={{-59,-20},{
69+
10,-20},{10,-29}}, color={255,0,255}));
7070
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
71-
-100},{100,100}}), graphics={Text(
72-
extent={{-100,80},{100,60}},
73-
textColor={0,0,255},
74-
textString="Compare voltage and current of inductor1 and inductor2")}),
71+
-100},{100,100}})),
7572
experiment(
7673
StopTime=2,
7774
Interval=0.00025,

0 commit comments

Comments
 (0)
Please sign in to comment.